Changeset 577

Timestamp:

Oct 14, 2009, 11:58:34 AM (15 years ago)

Author:

Christopher Edwards

Message:

Fix for bug #6 & 4

Rearranged CCR template so it should pass schema validation

File:

• ccr/trunk/p/C0CCCR0.m (modified) (8 diffs)

ccr/trunk/p/C0CCCR0.m

@@ -1 @@
-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.
@@ -23 +23 @@
  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
@@ -38 +38 @@
  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)")
@@ -58 +58 @@
  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
@@ -103 +103 @@
  ;;<Problem>
  ;;<CCRDataObjectID>@@PROBLEMOBJECTID@@</CCRDataObjectID>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@PROBLEMDATEMOD@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Type>
  ;;<Text>Problem</Text>
  ;;</Type>
+ ;;<Description>
+ ;;<Text>@@PROBLEMDESCRIPTION@@</Text>
+ ;;<Code>
+ ;;<Value>@@PROBLEMCODEVALUE@@</Value>
+ ;;<CodingSystem>ICD9CM</CodingSystem>
+ ;;<Version>@@PROBLEMCODINGVERSION@@</Version>
+ ;;</Code>
+ ;;</Description>
  ;;<Status>
  ;;<Text>@@PROBLEMSTATUS@@</Text>
  ;;</Status>
- ;;<Description>
- ;;<Text>@@PROBLEMDESCRIPTION@@</Text>
- ;;<Code>
- ;;<Value>@@PROBLEMCODEVALUE@@</Value>
- ;;<CodingSystem>ICD9CM</CodingSystem>
- ;;<Version>@@PROBLEMCODINGVERSION@@</Version>
- ;;</Code>
- ;;</Description>
- ;;<DateTime>
- ;;<ExactDateTime>@@PROBLEMDATEMOD@@</ExactDateTime>
- ;;</DateTime>
  ;;<Source>
  ;;<Actor>
@@ -248 +248 @@
  ;;<Alert>
  ;;<CCRDataObjectID>@@ALERTOBJECTID@@</CCRDataObjectID>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@ALERTDATETIME@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Type>
  ;;<Text>@@ALERTTYPE@@</Text>
  ;;</Type>
- ;;<Description>
- ;;<Text>@@ALERTDESCRIPTIONTEXT@@</Text>
- ;;<Code>
- ;;<Value>@@ALERTCODEVALUE@@</Value>
- ;;<CodingSystem>@@ALERTCODESYSTEM@@</CodingSystem>
- ;;</Code>
- ;;</Description>
  ;;<Status>
  ;;<Text>@@ALERTSTATUSTEXT@@</Text>
  ;;</Status>
- ;;<DateTime>
- ;;<ExactDateTime>@@ALERTDATETIME@@</ExactDateTime>
- ;;</DateTime>
+ ;;<Description>
+ ;;<Text>@@ALERTDESCRIPTIONTEXT@@</Text>
+ ;;<Code>
+ ;;<Value>@@ALERTCODEVALUE@@</Value>
+ ;;<CodingSystem>@@ALERTCODESYSTEM@@</CodingSystem>
+ ;;</Code>
+ ;;</Description>
  ;;<Source>
  ;;<Actor>
@@ -275 +275 @@
  ;;<Source>
  ;;<Actor>
- ;;<ActorID>@@ALERTAGENTPRODUCTSOURCEID@@</ActorID>
- ;;</Actor>
- ;;</Source>
+ ;;<ActorID>@@ALERTSOURCEID@@</ActorID>
+ ;;</Actor>
+ ;;</Source>
+ ;;<Product>
  ;;<ProductName>
  ;;<Text>@@ALERTAGENTPRODUCTNAMETEXT@@</Text>
@@ -285 +286 @@
  ;;</Code>
  ;;</ProductName>
+ ;;</Product>
  ;;</Product>
  ;;</Products>