Changeset 98 for ccr/trunk


Ignore:
Timestamp:
Aug 22, 2008, 11:52:42 AM (16 years ago)
Author:
George Lilly
Message:

changes for XINDEX errors

Location:
ccr/trunk/p
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ccr/trunk/p/GPLACTORS.m

    r78 r98  
    1 GPLACTORS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
     1GPLACTORS  ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
    22 ;;0.3;CCDCCR;nopatch;noreleasedate
    33 ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
     
    3232  ; ^TMP(7542,1,"ACTORS",n)="ActorID^ActorType^ActorIEN"
    3333  ; ActorType is an enum containing either "PROVIDER" "PATIENT" "SYSTEM"
    34 
    3534  ; AXML is the output arrary, to contain XML.
    36 
     35  ;
    3736           N I,J,AMAP,AOID,ATYP,AIEN
    3837           D CP^GPLXPATH(IPXML,AXML) ; MAKE A COPY OF ACTORS XML
     
    6968           . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
    7069           ;
     70           N ACTTMP
    7171           D MISSING^GPLXPATH(AXML,"ACTTMP") ; SEARCH XML FOR MISSING VARS
    7272           I ACTTMP(0)>0  D  ; IF THERE ARE MISSING VARS -
     
    7979     ;
    8080     W "PROCESSING ACTOR PATIENT ",AIEN,!
    81      ; N AMAP
     81     N AMAP,ZX
    8282     S AMAP=$NA(^TMP($J,"AMAP"))
    8383     K @AMAP
  • ccr/trunk/p/GPLCCR.m

    r93 r98  
    9494    D INSINNER^GPLXPATH(CCRGLO,"ACTT2","//ContinuityOfCareRecord/Actors")
    9595    N TRIMI,J,DONE S DONE=0
    96     F TRIMI=0:0 D  Q:DONE ; DELETE UNTIL ALL EMPTY ELEMENTS ARE GONE
     96    F TRIMI=0:0 D  Q:DONE  ; DELETE UNTIL ALL EMPTY ELEMENTS ARE GONE
    9797    . S J=$$TRIM^GPLXPATH(CCRGLO) ; DELETE EMPTY ELEMENTS
    9898    . W "TRIMMED",J,!
  • ccr/trunk/p/GPLRIMA.m

    r97 r98  
    4949    S RIMDFN=BEGDFN ; BEGIN WITH THE BEGDFN PATIENT
    5050    I RIMDFN="" S RIMDFN=RESUME
    51     I +RIMDFN=0 D  Q ; AT THE END OF THE PATIENTS
     51    I +RIMDFN=0 D  Q  ; AT THE END OF THE PATIENTS
    5252    . W "END OF PATIENT LIST, CALL RESET^GPLRIMA",!
    53     F RIMI=1:1:DFNCNT  D  Q:+RIMDFN=0 ; FOR DFNCNT NUMBER OF PATIENTS OR END
     53    F RIMI=1:1:DFNCNT  D  Q:+RIMDFN=0  ; FOR DFNCNT NUMBER OF PATIENTS OR END
    5454    . D CCRRPC^GPLCCR(.CCRGLO,RIMDFN,"CCR","","","") ;PROCESS THE CCR
    5555    . W RIMDFN,!
     
    149149    I '$D(RIMBASE) D ASETUP ; FOR COMMANDLINE PROCESSING
    150150    N USETBL
    151     I '$D(@RIMBASE@("TABLES",PTBL)) D  Q ; NO TABLE
     151    I '$D(@RIMBASE@("TABLES",PTBL)) D  Q  ; NO TABLE
    152152    . W "ERROR NO SUCH TABLE",!
    153153    S USETBL=@RIMBASE@("TABLES",PTBL)
  • ccr/trunk/p/GPLXPATH.m

    r92 r98  
    321321         S XFIRST=$P(XNODE,"^",1)
    322322         S XLAST=$P(XNODE,"^",2)
    323          I RENEW="" D ; WE ARE DELETING A SECTION, MUST SAVE THE TAG
     323         I RENEW="" D  ; WE ARE DELETING A SECTION, MUST SAVE THE TAG
    324324         . D QUEUE("REBLD",REXML,1,XFIRST) ; THE BEFORE
    325325         . D QUEUE("REBLD",REXML,XLAST,@REXML@(0)) ; THE REST
     
    373373         . I @OXML@(I)?.E1"@@".E D  ; IS THERE A VARIABLE HERE?
    374374         . . S TSTR=$P(@IXML@(I),"@@",1) ; INIT TO PART BEFORE VARS
    375          . . F J=2:2:10  D  Q:$P(@IXML@(I),"@@",J+2)="" ; QUIT IF NO MORE VARS
     375         . . F J=2:2:10  D  Q:$P(@IXML@(I),"@@",J+2)=""  ; QUIT IF NO MORE VARS
    376376         . . . I DEBUG W "IN MAPPING LOOP: ",TSTR,!
    377377         . . . S TNAM=$P(@OXML@(I),"@@",J) ; EXTRACT THE VARIABLE NAME
Note: See TracChangeset for help on using the changeset viewer.