From 89b19ec2a61252a37dc6c967b2a504b91dca3edb Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Wed, 10 Dec 2014 19:09:47 -0500 Subject: [PATCH] Alter the template includes so that fields are in xsd order. Signed-off-by: Jason Stephenson --- templates/includes/AcceptItemResponse.inc | 27 ++------- .../includes/CancelRequestItemResponse.inc | 31 ++++------- templates/includes/CheckInItemResponse.inc | 30 +++------- templates/includes/CheckOutItemResponse.inc | 15 ++++- templates/includes/ItemId.inc | 9 +++ templates/includes/ItemOptionalFields.inc | 55 +++++++++---------- templates/includes/LookupUserResponse.inc | 16 ++---- templates/includes/RenewItemResponse.inc | 15 ++++- templates/includes/RequestId.inc | 9 +++ templates/includes/RequestItemResponse.inc | 6 +- templates/includes/UserId.inc | 9 +++ templates/includes/UserOptionalFields.inc | 20 +++---- 12 files changed, 120 insertions(+), 122 deletions(-) create mode 100644 templates/includes/ItemId.inc create mode 100644 templates/includes/RequestId.inc create mode 100644 templates/includes/UserId.inc diff --git a/templates/includes/AcceptItemResponse.inc b/templates/includes/AcceptItemResponse.inc index 5f91712..2783a0b 100644 --- a/templates/includes/AcceptItemResponse.inc +++ b/templates/includes/AcceptItemResponse.inc @@ -1,21 +1,6 @@ - -[% IF data.RequestId.AgencyId -%] -[% data.RequestId.AgencyId | xml %] -[% END -%] -[% IF data.RequestId.RequestIdentifierType -%] -[% data.RequestId.RequestIdentifierType | xml %] -[% END -%] -[% data.RequestId.RequestIdentifierValue | xml %] - -[% IF data.ItemId -%] - -[% IF data.ItemId.AgencyId -%] -[% data.ItemId.AgencyId | xml %] -[% END -%] -[% IF data.ItemId.ItemIdentifierType -%] -[% data.ItemId.ItemIdentifierType | xml %] -[% END -%] -[% data.ItemId.ItemIdentifierValue | xml %] - -[% END -%] -[% INCLUDE "includes/UserOptionalFields.inc" -%] +[%- + INCLUDE "includes/RequestId.inc"; + IF data.ItemId; + INCLUDE "includes/ItemId.inc"; + END +-%] diff --git a/templates/includes/CancelRequestItemResponse.inc b/templates/includes/CancelRequestItemResponse.inc index ea3aa3d..dd17b58 100644 --- a/templates/includes/CancelRequestItemResponse.inc +++ b/templates/includes/CancelRequestItemResponse.inc @@ -1,20 +1,11 @@ - -[% IF data.RequestId.AgencyId -%] -[% data.RequestId.AgencyId | xml %] -[% END -%] -[% data.RequestId.RequestIdentifierValue | xml %] -[% IF data.RequestId.RequestIdentifierType -%] -[% data.RequestId.RequestIdentifierType | xml %] -[% END %] - - -[% IF data.UserId.AgencyId -%] -[% data.UserId.AgencyId | xml %] -[% END -%] -[% data.UserId.UserIdentifierValue | xml %] -[% IF data.UserId.UserIdentifierType -%] -[% data.UserId.UserIdentifierType | xml %] -[% END -%] - -[% INCLUDE "includes/UserOptionalFields.inc" -%] -[% INCLUDE "includes/ItemOptionalFields.inc" -%] +[%- + IF data.RequestId; + INCLUDE "includes/RequestId.inc"; + END; + IF data.ItemId; + INCLUDE "includes/ItemId.inc"; + END; + INCLUDE "includes/UserId.inc"; + INCLUDE "includes/ItemOptionalFields.inc" + INCLUDE "includes/UserOptionalFields.inc"; +-%] diff --git a/templates/includes/CheckInItemResponse.inc b/templates/includes/CheckInItemResponse.inc index 29943b0..cff0d33 100644 --- a/templates/includes/CheckInItemResponse.inc +++ b/templates/includes/CheckInItemResponse.inc @@ -1,22 +1,8 @@ - -[% IF data.ItemId.AgencyId -%] -[% data.ItemId.AgencyId | xml %] -[% END -%] -[% IF data.ItemId.ItemIdentifierType -%] -[% data.ItemId.ItemIdentifierType | xml %] -[% END -%] -[% data.ItemId.ItemIdentifierValue | xml %] - -[% IF data.UserId -%] - -[% IF data.UserId.AgencyId -%] -[% data.UserId.AgencyId | xml %] -[% END -%] -[% IF data.UserId.UserIdentifierType -%] -[% data.UserId.UserIdentifierType | xml %] -[% END -%] -[% data.UserId.UserIdentifierValue | xml %] - -[% END -%] -[% INCLUDE "includes/UserOptionalFields.inc" -%] -[% INCLUDE "includes/ItemOptionalFields.inc" -%] +[%- + INCLUDE "includes/ItemId.inc"; + IF data.UserId; + INCLUDE "includes/UserId.inc"; + END; + INCLUDE "includes/ItemOptionalFields.inc"; + INCLUDE "includes/UserOptionalFields.inc"; +-%] diff --git a/templates/includes/CheckOutItemResponse.inc b/templates/includes/CheckOutItemResponse.inc index 661a94b..a6be123 100644 --- a/templates/includes/CheckOutItemResponse.inc +++ b/templates/includes/CheckOutItemResponse.inc @@ -1,4 +1,13 @@ -[% INCLUDE "includes/CheckInItemResponse.inc" %] -[% IF data.DateDue -%] +[%- + INCLUDE "includes/ItemId.inc"; + IF data.UserId; + INCLUDE "includes/UserId.inc"; + END; + IF data.DateDue +-%] [% data.DateDue | xml %] -[% END -%] +[%- + END; + INCLUDE "includes/ItemOptionalFields.inc"; + INCLUDE "includes/UserOptionalFields.inc"; +-%] diff --git a/templates/includes/ItemId.inc b/templates/includes/ItemId.inc new file mode 100644 index 0000000..40663c6 --- /dev/null +++ b/templates/includes/ItemId.inc @@ -0,0 +1,9 @@ + +[% IF data.ItemId.AgencyId -%] +[% data.ItemId.AgencyId | xml %] +[% END -%] +[% IF data.ItemId.ItemIdentifierType -%] +[% data.ItemId.ItemIdentifierType | xml %] +[% END -%] +[% data.ItemId.ItemIdentifierValue | xml %] + diff --git a/templates/includes/ItemOptionalFields.inc b/templates/includes/ItemOptionalFields.inc index 662c031..e65697e 100644 --- a/templates/includes/ItemOptionalFields.inc +++ b/templates/includes/ItemOptionalFields.inc @@ -5,57 +5,56 @@ [% IF data.ItemOptionalFields.BibliographicDescription.Author -%] [% data.ItemOptionalFields.BibliographicDescription.Author | xml %] [% END -%] -[% IF data.ItemOptionalFields.BibliographicDescription.Title -%] -[% data.ItemOptionalFields.BibliographicDescription.Title | xml %] -[% END -%] -[% IF data.ItemOptionalFields.BibliographicDescription.Publisher -%] -[% data.ItemOptionalFields.BibliographicDescription.Publisher | xml %] -[% END -%] -[% IF data.ItemOptionalFields.BibliographicDescription.PublicationDate -%] -[% data.ItemOptionalFields.BibliographicDescription.PublicationDate | xml %] +[% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId; + id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%] + +[% id.BibliographicItemIdentifier | xml %] +[% IF id.BibliographicItemIdentifierCode -%] +[% id.BibliographicItemIdentifierCode | xml %] [% END -%] -[% IF data.ItemOptionalFields.BibliographicDescription.Edition -%] -[% data.ItemOptionalFields.BibliographicDescription.Edition | xml %] + [% END -%] [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId; id = data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId -%] [% id.BibliographicRecordIdentifier | xml %] -[% IF id.BibliographicRecordIdentifierCode -%] -[% id.BibliographicRecordIdentifierCode | xml %] -[% END -%] [% IF id.AgencyId -%] [% id.AgencyId | xml %] +[% ELSIF id.BibliographicRecordIdentifierCode -%] +[% id.BibliographicRecordIdentifierCode | xml %] [% END -%] [% END -%] -[% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId; - id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%] - -[% id.BibliographicItemIdentifier | xml %] -[% IF id.BibliographicItemIdentifierCode -%] -[% id.BibliographicItemIdentifierCode | xml %] +[% IF data.ItemOptionalFields.BibliographicDescription.Edition -%] +[% data.ItemOptionalFields.BibliographicDescription.Edition | xml %] [% END -%] - +[% IF data.ItemOptionalFields.BibliographicDescription.PublicationDate -%] +[% data.ItemOptionalFields.BibliographicDescription.PublicationDate | xml %] +[% END -%] +[% IF data.ItemOptionalFields.BibliographicDescription.Publisher -%] +[% data.ItemOptionalFields.BibliographicDescription.Publisher | xml %] +[% END -%] +[% IF data.ItemOptionalFields.BibliographicDescription.Title -%] +[% data.ItemOptionalFields.BibliographicDescription.Title | xml %] [% END -%] [% END -%] +[% IF data.ItemOptionalFields.ItemUseRestrictionType -%] +[% data.ItemOptionalFields.ItemUseRestrictionType | xml %] +[% END -%] +[% IF data.ItemOptionalFields.CirculationStatus -%] +[% data.ItemOptionalFields.CirculationStatus | xml %] +[% END -%] [% IF data.ItemOptionalFields.ItemDescription -%] [% data.ItemOptionalFields.ItemDescription.CallNumber | xml %] [% END -%] -[% IF data.ItemOptionalFields.CirculationStatus -%] -[% data.ItemOptionalFields.CirculationStatus | xml %] +[% IF data.ItemOptionalFields.PhysicalCondition -%] +[% data.ItemOptionalFields.PhysicalCondition | xml %] [% END -%] [% IF data.ItemOptionalFields.DateDue -%] [% data.ItemOptionalFields.DateDue | xml %] [% END -%] -[% IF data.ItemOptionalFields.ItemUseRestrictionType -%] -[% data.ItemOptionalFields.ItemUseRestrictionType | xml %] -[% END -%] -[% IF data.ItemOptionalFields.PhysicalCondition -%] -[% data.ItemOptionalFields.PhysicalCondition | xml %] -[% END -%] [% END -%] diff --git a/templates/includes/LookupUserResponse.inc b/templates/includes/LookupUserResponse.inc index aba868e..300054a 100644 --- a/templates/includes/LookupUserResponse.inc +++ b/templates/includes/LookupUserResponse.inc @@ -1,12 +1,4 @@ -[% FOREACH id IN data.UserId -%] - -[% IF id.UserIdentifierType -%] -[% id.UserIdentifierType | xml %] -[% END -%] -[% IF id.AgencyId -%] -[% id.AgencyId %] -[% END -%] -[% id.UserIdentifierValue | xml %] - -[% END -%] -[% INCLUDE "includes/UserOptionalFields.inc" -%] +[%- + INCLUDE "includes/UserId.inc"; + INCLUDE "includes/UserOptionalFields.inc" +-%] diff --git a/templates/includes/RenewItemResponse.inc b/templates/includes/RenewItemResponse.inc index 661a94b..a6be123 100644 --- a/templates/includes/RenewItemResponse.inc +++ b/templates/includes/RenewItemResponse.inc @@ -1,4 +1,13 @@ -[% INCLUDE "includes/CheckInItemResponse.inc" %] -[% IF data.DateDue -%] +[%- + INCLUDE "includes/ItemId.inc"; + IF data.UserId; + INCLUDE "includes/UserId.inc"; + END; + IF data.DateDue +-%] [% data.DateDue | xml %] -[% END -%] +[%- + END; + INCLUDE "includes/ItemOptionalFields.inc"; + INCLUDE "includes/UserOptionalFields.inc"; +-%] diff --git a/templates/includes/RequestId.inc b/templates/includes/RequestId.inc new file mode 100644 index 0000000..1cb14c6 --- /dev/null +++ b/templates/includes/RequestId.inc @@ -0,0 +1,9 @@ + +[% IF data.RequestId.AgencyId -%] +[% data.RequestId.AgencyId | xml %] +[% END -%] +[% IF data.RequestId.RequestIdentifierType -%] +[% data.RequestId.RequestIdentifierType | xml %] +[% END -%] +[% data.RequestId.RequestIdentifierValue | xml %] + diff --git a/templates/includes/RequestItemResponse.inc b/templates/includes/RequestItemResponse.inc index 1aaadb3..6b74028 100644 --- a/templates/includes/RequestItemResponse.inc +++ b/templates/includes/RequestItemResponse.inc @@ -2,21 +2,21 @@ [% IF data.RequestId.AgencyId -%] [% data.RequestId.AgencyId | xml %] [% END -%] -[% data.RequestId.RequestIdentifierValue | xml %] [% IF data.RequestId.RequestIdentifierType -%] [% data.RequestId.RequestIdentifierType | xml %] [% END %] +[% data.RequestId.RequestIdentifierValue | xml %] [% IF data.UserId.AgencyId -%] [% data.UserId.AgencyId | xml %] [% END -%] -[% data.UserId.UserIdentifierValue | xml %] [% IF data.UserId.UserIdentifierType -%] [% data.UserId.UserIdentifierType | xml %] +[% data.UserId.UserIdentifierValue | xml %] [% END -%] [% data.RequestType | xml %] [% data.RequestScopeType | xml %] -[% INCLUDE "includes/UserOptionalFields.inc" -%] [% INCLUDE "includes/ItemOptionalFields.inc" -%] +[% INCLUDE "includes/UserOptionalFields.inc" -%] diff --git a/templates/includes/UserId.inc b/templates/includes/UserId.inc new file mode 100644 index 0000000..31c5e08 --- /dev/null +++ b/templates/includes/UserId.inc @@ -0,0 +1,9 @@ + +[% IF data.UserId.AgencyId -%] +[% data.UserId.AgencyId | xml %] +[% END -%] +[% IF data.UserId.UserIdentifierType -%] +[% data.UserId.UserIdentifierType | xml %] +[% END -%] +[% data.UserId.UserIdentifierValue | xml %] + diff --git a/templates/includes/UserOptionalFields.inc b/templates/includes/UserOptionalFields.inc index bb3257f..a24c461 100644 --- a/templates/includes/UserOptionalFields.inc +++ b/templates/includes/UserOptionalFields.inc @@ -4,19 +4,19 @@ -[% IF data.UserOptionalFields.NameInformation.GivenName -%] -[% data.UserOptionalFields.NameInformation.GivenName | xml %] -[% END -%] -[% data.UserOptionalFields.NameInformation.Surname | xml %] [% IF data.UserOptionalFields.NameInformation.Prefix -%] [% data.UserOptionalFields.NameInformation.Prefix %] [% END -%] -[% IF data.UserOptionalFields.NameInformation.Suffix -%] -[% data.UserOptionalFields.NameInformation.Suffix %] +[% IF data.UserOptionalFields.NameInformation.GivenName -%] +[% data.UserOptionalFields.NameInformation.GivenName | xml %] [% END -%] [% IF data.UserOptionalFields.NameInformation.Initials -%] [% data.UserOptionalFields.NameInformation.Initials %] [% END -%] +[% data.UserOptionalFields.NameInformation.Surname | xml %] +[% IF data.UserOptionalFields.NameInformation.Suffix -%] +[% data.UserOptionalFields.NameInformation.Suffix %] +[% END -%] @@ -56,6 +56,10 @@ [% END -%] [% END -%] +[% IF data.UserOptionalFields.UserLanguage -%] +[% FOREACH language IN data.UserOptionalFields.UserLanguage -%] +[% language | xml %] +[% END -%] [% IF data.UserOptionalFields.UserPrivilege -%] [% FOREACH privilege IN data.UserOptionalFields.UserPrivilege -%] @@ -81,10 +85,6 @@ [% END -%] [% END -%] -[% IF data.UserOptionalFields.UserLanguage -%] -[% FOREACH language IN data.UserOptionalFields.UserLanguage -%] -[% language | xml %] -[% END -%] [% END -%] [% IF data.UserOptionalFields.BlockOrTrap -%] [% FOREACH block IN data.UserOptionalFields.BlockOrTrap -%] -- 2.43.2