Alter the template includes so that fields are in xsd order.

Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/templates/includes/AcceptItemResponse.inc b/templates/includes/AcceptItemResponse.inc
index 5f91712..2783a0b 100644 (file)
--- a/templates/includes/AcceptItemResponse.inc
+++ b/templates/includes/AcceptItemResponse.inc
@@ -1,21 +1,6 @@
-<RequestId>
-[% IF data.RequestId.AgencyId -%]
-<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
-[% END -%]
-[% IF data.RequestId.RequestIdentifierType -%]
-<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
-[% END -%]
-<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
-</RequestId>
-[% IF data.ItemId -%]
-<ItemId>
-[% IF data.ItemId.AgencyId -%]
-<AgencyId>[% data.ItemId.AgencyId | xml %]</AgencyId>
-[% END -%]
-[% IF data.ItemId.ItemIdentifierType -%]
-<ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ItemIdentifierType>
-[% END -%]
-<ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ItemIdentifierValue>
-</ItemId>
-[% 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 (file)
--- a/templates/includes/CancelRequestItemResponse.inc
+++ b/templates/includes/CancelRequestItemResponse.inc
@@ -1,20 +1,11 @@
-<RequestId>
-[% IF data.RequestId.AgencyId -%]
-<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
-[% END -%]
-<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
-[% IF data.RequestId.RequestIdentifierType -%]
-<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
-[% END %]
-</RequestId>
-<UserId>
-[% IF data.UserId.AgencyId -%]
-<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
-[% END -%]
-<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
-[% IF data.UserId.UserIdentifierType -%]
-<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
-[% END -%]
-</UserId>
-[% 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 (file)
--- a/templates/includes/CheckInItemResponse.inc
+++ b/templates/includes/CheckInItemResponse.inc
@@ -1,22 +1,8 @@
-<ItemId>
-[% IF data.ItemId.AgencyId -%]
-<AgencyId>[% data.ItemId.AgencyId | xml %]</AgencyId>
-[% END -%]
-[% IF data.ItemId.ItemIdentifierType -%]
-<ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ItemIdentifierType>
-[% END -%]
-<ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ItemIdentifierValue>
-</ItemId>
-[% IF data.UserId -%]
-<UserId>
-[% IF data.UserId.AgencyId -%]
-<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
-[% END -%]
-[% IF data.UserId.UserIdentifierType -%]
-<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentifierType>
-[% END -%]
-<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
-</UserId>
-[% 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 (file)
--- 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
+-%]
 <DateDue>[% data.DateDue | xml %]</DateDue>
-[% 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 (file)
index 0000000..40663c6
--- /dev/null
+++ b/templates/includes/ItemId.inc
@@ -0,0 +1,9 @@
+<ItemId>
+[% IF data.ItemId.AgencyId -%]
+<AgencyId>[% data.ItemId.AgencyId | xml %]</AgencyId>
+[% END -%]
+[% IF data.ItemId.ItemIdentifierType -%]
+<ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ItemIdentifierType>
+[% END -%]
+<ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ItemIdentifierValue>
+</ItemId>

diff --git a/templates/includes/ItemOptionalFields.inc b/templates/includes/ItemOptionalFields.inc
index 662c031..e65697e 100644 (file)
--- a/templates/includes/ItemOptionalFields.inc
+++ b/templates/includes/ItemOptionalFields.inc
@@ -5,57 +5,56 @@
 [% IF data.ItemOptionalFields.BibliographicDescription.Author -%]
 <Author>[% data.ItemOptionalFields.BibliographicDescription.Author | xml %]</Author>
 [% END -%]
-[% IF data.ItemOptionalFields.BibliographicDescription.Title -%]
-<Title>[% data.ItemOptionalFields.BibliographicDescription.Title | xml %]</Title>
-[% END -%]
-[% IF data.ItemOptionalFields.BibliographicDescription.Publisher -%]
-<Publisher>[% data.ItemOptionalFields.BibliographicDescription.Publisher | xml %]</Publisher>
-[% END -%]
-[% IF data.ItemOptionalFields.BibliographicDescription.PublicationDate -%]
-<PublicationDate>[% data.ItemOptionalFields.BibliographicDescription.PublicationDate | xml %]</PublicationDate>
+[% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId;
+      id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%]
+<BibliographicItemId>
+<BibliographicItemIdentifier>[% id.BibliographicItemIdentifier | xml %]</BibliographicItemIdentifier>
+[% IF id.BibliographicItemIdentifierCode -%]
+<BibliographicItemIdentifierCode>[% id.BibliographicItemIdentifierCode | xml %]</BibliographicItemIdentifierCode>
 [% END -%]
-[% IF data.ItemOptionalFields.BibliographicDescription.Edition -%]
-<Edition>[% data.ItemOptionalFields.BibliographicDescription.Edition | xml %]</Edition>
+</BibliographicItemId>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId;
       id = data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId -%]
 <BibliographicRecordId>
 <BibliographicRecordIdentifier>[% id.BibliographicRecordIdentifier | xml %]</BibliographicRecordIdentifer>
-[% IF id.BibliographicRecordIdentifierCode -%]
-<BibliographicRecordIdentifierCode>[% id.BibliographicRecordIdentifierCode | xml %]</BibliographicRecordIdentifierCode>
-[% END -%]
 [% IF id.AgencyId -%]
 <AgencyId>[% id.AgencyId | xml %]</AgencyId>
+[% ELSIF id.BibliographicRecordIdentifierCode -%]
+<BibliographicRecordIdentifierCode>[% id.BibliographicRecordIdentifierCode | xml %]</BibliographicRecordIdentifierCode>
 [% END -%]
 </BibliographicRecordId>
 [% END -%]
-[% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId;
-      id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%]
-<BibliographicItemId>
-<BibliographicItemIdentifier>[% id.BibliographicItemIdentifier | xml %]</BibliographicItemIdentifier>
-[% IF id.BibliographicItemIdentifierCode -%]
-<BibliographicItemIdentifierCode>[% id.BibliographicItemIdentifierCode | xml %]</BibliographicItemIdentifierCode>
+[% IF data.ItemOptionalFields.BibliographicDescription.Edition -%]
+<Edition>[% data.ItemOptionalFields.BibliographicDescription.Edition | xml %]</Edition>
 [% END -%]
-</BibliographicItemId>
+[% IF data.ItemOptionalFields.BibliographicDescription.PublicationDate -%]
+<PublicationDate>[% data.ItemOptionalFields.BibliographicDescription.PublicationDate | xml %]</PublicationDate>
+[% END -%]
+[% IF data.ItemOptionalFields.BibliographicDescription.Publisher -%]
+<Publisher>[% data.ItemOptionalFields.BibliographicDescription.Publisher | xml %]</Publisher>
+[% END -%]
+[% IF data.ItemOptionalFields.BibliographicDescription.Title -%]
+<Title>[% data.ItemOptionalFields.BibliographicDescription.Title | xml %]</Title>
 [% END -%]
 </BibliographicDescription>
 [% END -%]
+[% IF data.ItemOptionalFields.ItemUseRestrictionType -%]
+<ItemUseRestrictionType>[% data.ItemOptionalFields.ItemUseRestrictionType | xml %]</ItemUseRestrictionType>
+[% END -%]
+[% IF data.ItemOptionalFields.CirculationStatus -%]
+<CirculationStatus>[% data.ItemOptionalFields.CirculationStatus | xml %]</CirculationStatus>
+[% END -%]
 [% IF data.ItemOptionalFields.ItemDescription -%]
 <ItemDescription>
 <CallNumber>[% data.ItemOptionalFields.ItemDescription.CallNumber | xml %]</CallNumber>
 </ItemDescription>
 [% END -%]
-[% IF data.ItemOptionalFields.CirculationStatus -%]
-<CirculationStatus>[% data.ItemOptionalFields.CirculationStatus | xml %]</CirculationStatus>
+[% IF data.ItemOptionalFields.PhysicalCondition -%]
+<PhysicalCondition>[% data.ItemOptionalFields.PhysicalCondition | xml %]</PhysicalCondition>
 [% END -%]
 [% IF data.ItemOptionalFields.DateDue -%]
 <DateDue>[% data.ItemOptionalFields.DateDue | xml %]</DateDue>
 [% END -%]
-[% IF data.ItemOptionalFields.ItemUseRestrictionType -%]
-<ItemUseRestrictionType>[% data.ItemOptionalFields.ItemUseRestrictionType | xml %]</ItemUseRestrictionType>
-[% END -%]
-[% IF data.ItemOptionalFields.PhysicalCondition -%]
-<PhysicalCondition>[% data.ItemOptionalFields.PhysicalCondition | xml %]</PhysicalCondition>
-[% END -%]
 </ItemOptionalFields>
 [% END -%]

diff --git a/templates/includes/LookupUserResponse.inc b/templates/includes/LookupUserResponse.inc
index aba868e..300054a 100644 (file)
--- a/templates/includes/LookupUserResponse.inc
+++ b/templates/includes/LookupUserResponse.inc
@@ -1,12 +1,4 @@
-[% FOREACH id IN data.UserId -%]
-<UserId>
-[% IF id.UserIdentifierType -%]
-<UserIdentifierType>[% id.UserIdentifierType | xml %]</UserIdentifierType>
-[% END -%]
-[% IF id.AgencyId -%]
-<AgencyId>[% id.AgencyId %]</AgencyId>
-[% END -%]
-<UserIdentifierValue>[% id.UserIdentifierValue | xml %]</UserIdentifierValue>
-</UserId>
-[% 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 (file)
--- 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
+-%]
 <DateDue>[% data.DateDue | xml %]</DateDue>
-[% 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 (file)
index 0000000..1cb14c6
--- /dev/null
+++ b/templates/includes/RequestId.inc
@@ -0,0 +1,9 @@
+<RequestId>
+[% IF data.RequestId.AgencyId -%]
+<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
+[% END -%]
+[% IF data.RequestId.RequestIdentifierType -%]
+<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
+[% END -%]
+<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
+</RequestId>

diff --git a/templates/includes/RequestItemResponse.inc b/templates/includes/RequestItemResponse.inc
index 1aaadb3..6b74028 100644 (file)
--- a/templates/includes/RequestItemResponse.inc
+++ b/templates/includes/RequestItemResponse.inc
@@ -2,21 +2,21 @@
 [% IF data.RequestId.AgencyId -%]
 <AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
 [% IF data.RequestId.RequestIdentifierType -%]
 <RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
 [% END %]
+<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
 </RequestId>
 <UserId>
 [% IF data.UserId.AgencyId -%]
 <AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
 [% IF data.UserId.UserIdentifierType -%]
 <UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
+<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
 [% END -%]
 </UserId>
 <RequestType>[% data.RequestType | xml %]</RequestType>
 <RequestScopeType>[% data.RequestScopeType | xml %]</RequestScopeType>
-[% 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 (file)
index 0000000..31c5e08
--- /dev/null
+++ b/templates/includes/UserId.inc
@@ -0,0 +1,9 @@
+<UserId>
+[% IF data.UserId.AgencyId -%]
+<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
+[% END -%]
+[% IF data.UserId.UserIdentifierType -%]
+<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
+[% END -%]
+<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
+</UserId>

diff --git a/templates/includes/UserOptionalFields.inc b/templates/includes/UserOptionalFields.inc
index bb3257f..a24c461 100644 (file)
--- a/templates/includes/UserOptionalFields.inc
+++ b/templates/includes/UserOptionalFields.inc
@@ -4,19 +4,19 @@
 <NameInformation>
 <PersonalNameInformation>
 <StructuredPersonalUserName>
-[% IF data.UserOptionalFields.NameInformation.GivenName -%]
-<GivenName>[% data.UserOptionalFields.NameInformation.GivenName | xml %]</GivenName>
-[% END -%]
-<Surname>[% data.UserOptionalFields.NameInformation.Surname | xml %]</Surname>
 [% IF data.UserOptionalFields.NameInformation.Prefix -%]
 <Prefix>[% data.UserOptionalFields.NameInformation.Prefix %]</Prefix>
 [% END -%]
-[% IF data.UserOptionalFields.NameInformation.Suffix -%]
-<Suffix>[% data.UserOptionalFields.NameInformation.Suffix %]</Suffix>
+[% IF data.UserOptionalFields.NameInformation.GivenName -%]
+<GivenName>[% data.UserOptionalFields.NameInformation.GivenName | xml %]</GivenName>
 [% END -%]
 [% IF data.UserOptionalFields.NameInformation.Initials -%]
 <Initials>[% data.UserOptionalFields.NameInformation.Initials %]</Initials>
 [% END -%]
+<Surname>[% data.UserOptionalFields.NameInformation.Surname | xml %]</Surname>
+[% IF data.UserOptionalFields.NameInformation.Suffix -%]
+<Suffix>[% data.UserOptionalFields.NameInformation.Suffix %]</Suffix>
+[% END -%]
 </StructuredPersonalUserName>
 </PersonalNameInformation>
 </NameInformation>
@@ -56,6 +56,10 @@
 </UserAddressInformation>
 [% END -%]
 [% END -%]
+[% IF data.UserOptionalFields.UserLanguage -%]
+[% FOREACH language IN data.UserOptionalFields.UserLanguage -%]
+<UserLanguage>[% language | xml %]</UserLanguage>
+[% END -%]
 [% IF data.UserOptionalFields.UserPrivilege -%]
 [% FOREACH privilege IN data.UserOptionalFields.UserPrivilege -%]
 <UserPrivilege>
@@ -81,10 +85,6 @@
 </UserPrivilege>
 [% END -%]
 [% END -%]
-[% IF data.UserOptionalFields.UserLanguage -%]
-[% FOREACH language IN data.UserOptionalFields.UserLanguage -%]
-<UserLanguage>[% language | xml %]</UserLanguage>
-[% END -%]
 [% END -%]
 [% IF data.UserOptionalFields.BlockOrTrap -%]
 [% FOREACH block IN data.UserOptionalFields.BlockOrTrap -%]