Fix for bug #6 & 4

Rearranged CCR template so it should pass schema validation

p/C0CCCR0.m

@@ -1,5 +1,5 @@
-C0CCCR0	; CCDCCR/GPL - CCR TEMPLATE AND ACCESS ROUTINES; 5/31/08
- ;;1.0;C0C;;May 19, 2009;
+C0CCCR0 ; CCDCCR/GPL - CCR TEMPLATE AND ACCESS ROUTINES; 5/31/08
+ ;;1.0;C0C;;May 19, 2009;Build 32
  ;Copyright 2008,2009 George Lilly, University of Minnesota.
  ;Licensed under the terms of the GNU General Public License.
  ;See attached copy of the License.
@@ -22,7 +22,7 @@ C0CCCR0	; CCDCCR/GPL - CCR TEMPLATE AND ACCESS ROUTINES; 5/31/08
  W !
  Q
  ;
-ZT(ZARY,BAT,LINE)	      ; private routine to add a line to the ZARY array
+ZT(ZARY,BAT,LINE)       ; private routine to add a line to the ZARY array
  ; ZARY IS PASSED BY NAME
  ; BAT is a string identifying the section
  ; LINE is a test which will evaluate to true or false
@@ -37,7 +37,7 @@ ZT(ZARY,BAT,LINE)	      ; private routine to add a line to the ZARY array
  S @ZARY@(0)=CNT ; update the array counter
  Q
  ;
-ZLOAD(ZARY,ROUTINE)	     ; load tests into ZARY which is passed by reference
+ZLOAD(ZARY,ROUTINE)      ; load tests into ZARY which is passed by reference
  ; ZARY IS PASSED BY NAME
  ; ZARY = name of the root, closed array format (e.g., "^TMP($J)")
  ; ROUTINE = NAME OF THE ROUTINE - PASSED BY VALUE
@@ -57,7 +57,7 @@ ZLOAD(ZARY,ROUTINE)	     ; load tests into ZARY which is passed by reference
  . . . D ZT(ZARY,SECTION,$P(LINE,";;",2)) ; put the line in the array
  Q
  ;
-LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
+LOAD(ARY)       ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  D ZLOAD(ARY,"C0CCCR0")
  ; ZWR @ARY
  Q
@@ -102,12 +102,12 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<Problems>
  ;;<Problem>
  ;;<CCRDataObjectID>@@PROBLEMOBJECTID@@</CCRDataObjectID>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@PROBLEMDATEMOD@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Type>
  ;;<Text>Problem</Text>
  ;;</Type>
- ;;<Status>
- ;;<Text>@@PROBLEMSTATUS@@</Text>
- ;;</Status>
  ;;<Description>
  ;;<Text>@@PROBLEMDESCRIPTION@@</Text>
  ;;<Code>
@@ -116,9 +116,9 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<Version>@@PROBLEMCODINGVERSION@@</Version>
  ;;</Code>
  ;;</Description>
- ;;<DateTime>
- ;;<ExactDateTime>@@PROBLEMDATEMOD@@</ExactDateTime>
- ;;</DateTime>
+ ;;<Status>
+ ;;<Text>@@PROBLEMSTATUS@@</Text>
+ ;;</Status>
  ;;<Source>
  ;;<Actor>
  ;;<ActorID>@@PROBLEMSOURCEACTORID@@</ActorID>
@@ -247,9 +247,15 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<Alerts>
  ;;<Alert>
  ;;<CCRDataObjectID>@@ALERTOBJECTID@@</CCRDataObjectID>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@ALERTDATETIME@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Type>
  ;;<Text>@@ALERTTYPE@@</Text>
  ;;</Type>
+ ;;<Status>
+ ;;<Text>@@ALERTSTATUSTEXT@@</Text>
+ ;;</Status>
  ;;<Description>
  ;;<Text>@@ALERTDESCRIPTIONTEXT@@</Text>
  ;;<Code>
@@ -257,12 +263,6 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<CodingSystem>@@ALERTCODESYSTEM@@</CodingSystem>
  ;;</Code>
  ;;</Description>
- ;;<Status>
- ;;<Text>@@ALERTSTATUSTEXT@@</Text>
- ;;</Status>
- ;;<DateTime>
- ;;<ExactDateTime>@@ALERTDATETIME@@</ExactDateTime>
- ;;</DateTime>
  ;;<Source>
  ;;<Actor>
  ;;<ActorID>@@ALERTSOURCEID@@</ActorID>
@@ -274,9 +274,10 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<CCRDataObjectID>@@ALERTAGENTPRODUCTOBJECTID@@</CCRDataObjectID>
  ;;<Source>
  ;;<Actor>
- ;;<ActorID>@@ALERTAGENTPRODUCTSOURCEID@@</ActorID>
+ ;;<ActorID>@@ALERTSOURCEID@@</ActorID>
  ;;</Actor>
  ;;</Source>
+ ;;<Product>
  ;;<ProductName>
  ;;<Text>@@ALERTAGENTPRODUCTNAMETEXT@@</Text>
  ;;<Code>
@@ -285,6 +286,7 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;</Code>
  ;;</ProductName>
  ;;</Product>
+ ;;</Product>
  ;;</Products>
  ;;</Agent>
  ;;<Reaction>
@@ -783,4 +785,4 @@ LOAD(ARY)	      ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;</CCRSignature>
  ;;</Signatures>
  ;;</ContinuityOfCareRecord>
- ;</TEMPLATE>
+ ;</TEMPLATE>