fixed template problems

This commit is contained in:
george 2008-08-19 18:38:15 +00:00
parent dbcbc016a1
commit 2a10e4c419
2 changed files with 9 additions and 6 deletions

View File

@ -243,7 +243,6 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<ActorID>@@ALERTAGENTPRODUCTSOURCEID@@</ActorID> ;;<ActorID>@@ALERTAGENTPRODUCTSOURCEID@@</ActorID>
;;</Actor> ;;</Actor>
;;</Source> ;;</Source>
;;<Product>
;;<ProductName> ;;<ProductName>
;;<Text>@@ALERTAGENTPRODUCTNAMETEXT@@</Text> ;;<Text>@@ALERTAGENTPRODUCTNAMETEXT@@</Text>
;;<Code> ;;<Code>
@ -252,7 +251,6 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;</Code> ;;</Code>
;;</ProductName> ;;</ProductName>
;;</Product> ;;</Product>
;;</Product>
;;</Products> ;;</Products>
;;</Agent> ;;</Agent>
;;<Reaction> ;;<Reaction>
@ -290,6 +288,7 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;</Type> ;;</Type>
;;<Description> ;;<Description>
;;<Text>@@MEDDETAILUNADORNED@@</Text> ;;<Text>@@MEDDETAILUNADORNED@@</Text>
;;</Description>
;;<Status> ;;<Status>
;;<Text>@@MEDSTATUSTEXT@@</Text> ;;<Text>@@MEDSTATUSTEXT@@</Text>
;;</Status> ;;</Status>
@ -323,9 +322,10 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<Value>@@MEDCONCVALUE@@</Value> ;;<Value>@@MEDCONCVALUE@@</Value>
;;<Units> ;;<Units>
;;<Unit>@@MEDCONCUNIT@@</Unit> ;;<Unit>@@MEDCONCUNIT@@</Unit>
;;</Units>
;;</Concentration> ;;</Concentration>
;;<Size> ;;<Size>
;;<Text>@@MEDSIZETEXT</Text> ;;<Text>@@MEDSIZETEXT@@</Text>
;;</Size> ;;</Size>
;;</Product> ;;</Product>
;;<Quantity> ;;<Quantity>
@ -333,6 +333,7 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<Units> ;;<Units>
;;<Unit>@@MEDQUANTITYUNIT@@</Unit> ;;<Unit>@@MEDQUANTITYUNIT@@</Unit>
;;</Units> ;;</Units>
;;</Quantity>
;;<Directions> ;;<Directions>
;;<Direction> ;;<Direction>
;;<Description> ;;<Description>
@ -366,18 +367,19 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<Value>@@MEDFREQUENCYVALUE@@</Value> ;;<Value>@@MEDFREQUENCYVALUE@@</Value>
;;<Units> ;;<Units>
;;<Unit>@@MEDFREQUENCYUNIT@@</Unit> ;;<Unit>@@MEDFREQUENCYUNIT@@</Unit>
;;<Units> ;;</Units>
;;</Frequency> ;;</Frequency>
;;<Interval> ;;<Interval>
;;<Value>@@MEDINTERVALVALUE@@</Value> ;;<Value>@@MEDINTERVALVALUE@@</Value>
;;<Units> ;;<Units>
;;<Unit>@@MEDINTERVALUNIT@@</Unit> ;;<Unit>@@MEDINTERVALUNIT@@</Unit>
;;<Units> ;;</Units>
;;</Interval> ;;</Interval>
;;<Duration> ;;<Duration>
;;<Value>@@MEDDURATIONVALUE@@</Value> ;;<Value>@@MEDDURATIONVALUE@@</Value>
;;<Units> ;;<Units>
;;<Unit>@@MEDDURATIONUNIT@@</Unit> ;;<Unit>@@MEDDURATIONUNIT@@</Unit>
;;</Units>
;;</Duration> ;;</Duration>
;;<Indication> ;;<Indication>
;;<PRNFlag> ;;<PRNFlag>
@ -422,7 +424,7 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<Refill> ;;<Refill>
;;<Number>@@MEDRFNO@@</Number> ;;<Number>@@MEDRFNO@@</Number>
;;</Refill> ;;</Refill>
;;<Refills> ;;</Refills>
;;</Medication> ;;</Medication>
;;</Medications> ;;</Medications>
;;<VitalSigns> ;;<VitalSigns>

View File

@ -115,6 +115,7 @@ INDEX(ZXML) ; parse the XML in ZXML and produce an XPATH index
. . . D POP("GPLSTK",.TMP) ; REMOVE FROM STACK . . . D POP("GPLSTK",.TMP) ; REMOVE FROM STACK
. . . I TMP'=CUR D ; MALFORMED XML, END MUST MATCH START . . . I TMP'=CUR D ; MALFORMED XML, END MUST MATCH START
. . . . W "MALFORMED XML ",CUR,"LINE "_I_LINE,! . . . . W "MALFORMED XML ",CUR,"LINE "_I_LINE,!
. . . . D PARY("GPLSTK") ; PRINT OUT THE STACK FOR DEBUGING
. . . . Q . . . . Q
. I FOUND'=1 D ; THE LINE MIGHT CONTAIN A SECTION BEGINNING . I FOUND'=1 D ; THE LINE MIGHT CONTAIN A SECTION BEGINNING
. . I (LINE?.E1"<"1.E)&(LINE'["?>") D ; BEGINNING OF A SECTION . . I (LINE?.E1"<"1.E)&(LINE'["?>") D ; BEGINNING OF A SECTION