From ba43ba99d646254ee7665c479565aa9088e6b44c Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Wed, 10 Dec 2014 21:13:59 -0500
Subject: [PATCH] Fixup RequestItemResponse template include file.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 templates/includes/RequestItemResponse.inc | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/templates/includes/RequestItemResponse.inc b/templates/includes/RequestItemResponse.inc
index 6b74028..4d26922 100644
--- a/templates/includes/RequestItemResponse.inc
+++ b/templates/includes/RequestItemResponse.inc
@@ -1,22 +1,19 @@
-<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>
-<UserId>
-[% IF data.UserId.AgencyId -%]
-<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
-[% END -%]
-[% IF data.UserId.UserIdentifierType -%]
-<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
-<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
-[% END -%]
-</UserId>
+[%-
+    IF data.RequestId;
+        INCLUDE "includes/RequestId.inc";
+    END;
+    INCLUDE "includes/ItemId.inc";
+    INCLUDE "includes/UserId.inc";
+    IF data.RequestType;
+-%]
 <RequestType>[% data.RequestType | xml %]</RequestType>
+[%-
+    END;
+    IF data.RequestScopeType;
+-%]
 <RequestScopeType>[% data.RequestScopeType | xml %]</RequestScopeType>
-[% INCLUDE "includes/ItemOptionalFields.inc" -%]
-[% INCLUDE "includes/UserOptionalFields.inc" -%]
+[%-
+    END;
+    INCLUDE "includes/ItemOptionalFields.inc";
+    INCLUDE "includes/UserOptionalFields.inc"
+-%]
-- 
2.43.2