Templates changes for Auto-graphics.

They requested that we remove "carriage returns" from the output. I'm not
100% certain if he meant all carriage returns or if he just wanted the
weird spacing that some elements had where the open tag is on one line
followed by the value and the close tag on the next line. I don't really
know exactly why that was happening, but it seemed to have something to
do with trying to make the value come out on a line by its own between
the open and close tags. This change puts those elements on one line.

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

diff --git a/templates/includes/ItemOptionalFields.inc b/templates/includes/ItemOptionalFields.inc
index 35928f9..8a2f775 100644 (file)
--- a/templates/includes/ItemOptionalFields.inc
+++ b/templates/includes/ItemOptionalFields.inc
@@ -30,31 +30,21 @@
 [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId;
       id = data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId -%]
 <BibliographicRecordId>
-<BibliographicRecordIdentifier>
-[% id.BibliographicRecordIdentifier | xml %]
-</BibliographicRecordIdentifer>
+<BibliographicRecordIdentifier>[% id.BibliographicRecordIdentifier | xml %]</BibliographicRecordIdentifer>
 [% IF id.BibliographicRecordIdentifierCode -%]
-<BibliographicRecordIdentifierCode>
-[% id.BibliographicRecordIdentifierCode | xml %]
-</BibliographicRecordIdentifierCode>
+<BibliographicRecordIdentifierCode>[% id.BibliographicRecordIdentifierCode | xml %]</BibliographicRecordIdentifierCode>
 [% END -%]
 [% IF id.AgencyId -%]
-<AgencyId>
-[% id.AgencyId | xml %]
-</AgencyId>
+<AgencyId>[% id.AgencyId | xml %]</AgencyId>
 [% END -%]
 </BibliographicRecordId>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId;
       id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%]
 <BibliographicItemId>
-<BibliographicItemIdentifier>
-[% id.BibliographicItemIdentifier | xml %]
-</BibliographicItemIdentifier>
+<BibliographicItemIdentifier>[% id.BibliographicItemIdentifier | xml %]</BibliographicItemIdentifier>
 [% IF id.BibliographicItemIdentifierCode -%]
-<BibliographicItemIdentifierCode>
-[% id.BibliographicItemIdentifierCode | xml %]
-</BibliographicItemIdentifierCode>
+<BibliographicItemIdentifierCode>[% id.BibliographicItemIdentifierCode | xml %]</BibliographicItemIdentifierCode>
 [% END -%]
 </BibliographicItemId>
 [% END -%]
@@ -62,30 +52,20 @@
 [% END -%]
 [% IF data.ItemOptionalFields.ItemDescription -%]
 <ItemDescription>
-<CallNumber>
-[% data.ItemOptionalFields.ItemDescription.CallNumber | xml %]
-</CallNumber>
+<CallNumber>[% data.ItemOptionalFields.ItemDescription.CallNumber | xml %]</CallNumber>
 </ItemDescription>
 [% END -%]
 [% IF data.ItemOptionalFields.CirculationStatus -%]
-<CirculationStatus>
-[% data.ItemOptionalFields.CirculationStatus | xml %]
-</CirculationStatus>
+<CirculationStatus>[% data.ItemOptionalFields.CirculationStatus | xml %]</CirculationStatus>
 [% END -%]
 [% IF data.ItemOptionalFields.DateDue -%]
-<DateDue>
-[% data.ItemOptionalFields.DateDue | xml %]
-</DateDue>
+<DateDue>[% data.ItemOptionalFields.DateDue | xml %]</DateDue>
 [% END -%]
 [% IF data.ItemOptionalFields.ItemUseRestrictionType -%]
-<ItemUseRestrictionType>
-[% data.ItemOptionalFields.ItemUseRestrictionType | xml %]
-</ItemUseRestrictionType>
+<ItemUseRestrictionType>[% data.ItemOptionalFields.ItemUseRestrictionType | xml %]</ItemUseRestrictionType>
 [% END -%]
 [% IF data.ItemOptionalFields.PhysicalCondition -%]
-<PhysicalCondition>
-[% data.ItemOptionalFields.PhysicalCondition | xml %]
-</PhysicalCondition>
+<PhysicalCondition>[% data.ItemOptionalFields.PhysicalCondition | xml %]</PhysicalCondition>
 [% END -%]
 </ItemOptionalFields>
 [% END -%]

diff --git a/templates/includes/LookupUserResponse.inc b/templates/includes/LookupUserResponse.inc
index c2d7580..aba868e 100644 (file)
--- a/templates/includes/LookupUserResponse.inc
+++ b/templates/includes/LookupUserResponse.inc
@@ -1,18 +1,12 @@
 [% FOREACH id IN data.UserId -%]
 <UserId>
 [% IF id.UserIdentifierType -%]
-<UserIdentifierType>
-[% id.UserIdentifierType | xml %]
-</UserIdentifierType>
+<UserIdentifierType>[% id.UserIdentifierType | xml %]</UserIdentifierType>
 [% END -%]
 [% IF id.AgencyId -%]
-<AgencyId>
-[% id.AgencyId %]
-</AgencyId>
+<AgencyId>[% id.AgencyId %]</AgencyId>
 [% END -%]
-<UserIdentifierValue>
-[% id.UserIdentifierValue | xml %]
-</UserIdentifierValue>
+<UserIdentifierValue>[% id.UserIdentifierValue | xml %]</UserIdentifierValue>
 </UserId>
 [% END -%]
 [% INCLUDE "includes/UserOptionalFields.inc" -%]

diff --git a/templates/includes/LookupVersionResponse.inc b/templates/includes/LookupVersionResponse.inc
index f59fa05..8ea50ac 100644 (file)
--- a/templates/includes/LookupVersionResponse.inc
+++ b/templates/includes/LookupVersionResponse.inc
@@ -1,15 +1,9 @@
 <FromAgencyId>
-<AgencyId>
-[%- data.fromagencyid -%]
-</AgencyId>
+<AgencyId>[% data.fromagencyid | xml %]</AgencyId>
 </FromAgencyId>
 <ToAgencyId>
-<AgencyId>
-[%- data.toagencyid -%]
-</AgencyId>
+<AgencyId>[% data.toagencyid | xml %]</AgencyId>
 </ToAgencyId>
 [% FOREACH version IN data.versions -%]
-<VersionSupported>
-[%- version | xml -%]
-</VersionSupported>
+<VersionSupported>[% version | xml %]</VersionSupported>
 [% END -%]

diff --git a/templates/includes/ResponseHeader.inc b/templates/includes/ResponseHeader.inc
index 669d7ec..a97a1f4 100644 (file)
--- a/templates/includes/ResponseHeader.inc
+++ b/templates/includes/ResponseHeader.inc
@@ -1,12 +1,8 @@
 <ResponseHeader>
 <FromAgencyId>
-<AgencyId>
-[% header.FromAgencyId.AgencyId | xml %]
-</AgencyId>
+<AgencyId>[% header.FromAgencyId.AgencyId | xml %]</AgencyId>
 </FromAgencyId>
 <ToAgencyId>
-<AgencyId>
-[% header.ToAgencyId.AgencyId  | xml %]
-</AgencyId>
+<AgencyId>[% header.ToAgencyId.AgencyId  | xml %]</AgencyId>
 </ToAgencyId>
 </ResponseHeader>

diff --git a/templates/includes/problem.inc b/templates/includes/problem.inc
index 2fd57db..336d4f8 100644 (file)
--- a/templates/includes/problem.inc
+++ b/templates/includes/problem.inc
@@ -4,15 +4,8 @@
 [% ELSE -%]
 <ProblemType>
 [% END -%]
-[% problem.ProblemType | xml %]
-</ProblemType>
-<ProblemDetail>
-[% problem.ProblemDetail | xml %]
-</ProblemDetail>
-<ProblemElement>
-[% problem.ProblemElement | xml %]
-</ProblemElement>
-<ProblemValue>
-[% problem.ProblemValue | xml %]
-</ProblemValue>
+[%- problem.ProblemType | xml %]</ProblemType>
+<ProblemDetail>[% problem.ProblemDetail | xml %]</ProblemDetail>
+<ProblemElement>[% problem.ProblemElement | xml %]</ProblemElement>
+<ProblemValue>[% problem.ProblemValue | xml %]</ProblemValue>
 </Problem>