Tidying up the templates, making sure is valid XML

diff --git a/templates/includes/LookupUserResponse.inc b/templates/includes/LookupUserResponse.inc
index 9545e04..1e54eff 100644 (file)
--- a/templates/includes/LookupUserResponse.inc
+++ b/templates/includes/LookupUserResponse.inc
@@ -40,4 +40,4 @@ RequestedItem
     </NameInformation>
   [% END %]
 [% END %]
-</UserOptionalFields/>
+</UserOptionalFields>

diff --git a/templates/includes/header.inc b/templates/includes/header.inc
index 797a783..4ac79c5 100644 (file)
--- a/templates/includes/header.inc
+++ b/templates/includes/header.inc
@@ -1,5 +1,3 @@
 <?xml version = '1.0' encoding='UTF-8'?>
-<!DOCTYPE NCIPMessage
-xmlns:xsi = 'http://www.w3.org/2001/XMLSchema- instance' 
-xsi:noNamespaceSchemaLocation = 'http://www.niso.org/ncip/v2_01/imp1/xsd/ncip_v2_01.xsd' 
-version = 'http://www.niso.org/ncip/v2_01/imp1/xsd/ncip_v2_01.xsd'>
+<NCIPMessage version='http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd' xmlns='http://www.niso.org/2008/ncip'>
+

diff --git a/templates/problem.tt b/templates/problem.tt
index 0c007b4..8a39f8b 100644 (file)
--- a/templates/problem.tt
+++ b/templates/problem.tt
@@ -1,5 +1,4 @@
 [% INCLUDE 'includes/header.inc' %]
-<NCIPMessage>
   <[% messagetype %]>
     [% IF processingerror %]
     <Problem>

diff --git a/templates/response.tt b/templates/response.tt
index 68519ae..eaf6bc9 100644 (file)
--- a/templates/response.tt
+++ b/templates/response.tt
@@ -1,7 +1,4 @@
-[%# INCLUDE 'includes/header.inc' %]
-
-<NCIPMessage>
-    <[% messagetype %]>
+   <[% messagetype %]>
        <ResponseHeader>
             <FromAgencyId>
               <AgencyId>[% fromagency | trim%]</AgencyId>