oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers MDSHandler.java, 1.13.4.1, 1.13.4.2

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15004/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers

Modified Files:
      Tag: RELEASE_10_06
	MDSHandler.java 
Log Message:
mds lab patch

Index: MDSHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/MDSHandler.java,v
retrieving revision 1.13.4.1
retrieving revision 1.13.4.2
diff -C2 -d -r1.13.4.1 -r1.13.4.2
*** MDSHandler.java	6 Jul 2010 19:31:41 -0000	1.13.4.1
--- MDSHandler.java	9 Dec 2010 11:21:08 -0000	1.13.4.2
***************
*** 17,29 ****
  import java.util.HashMap;
  
  import org.apache.log4j.Logger;
  
  import oscar.util.UtilDateUtilities;
  import ca.uhn.hl7v2.HL7Exception;
- import ca.uhn.hl7v2.model.Message;
- import ca.uhn.hl7v2.model.Segment;
- import ca.uhn.hl7v2.model.Structure;
- import ca.uhn.hl7v2.util.Terser;
- import ca.uhn.hl7v2.validation.impl.NoValidation;
  
  /**
--- 17,27 ----
  import java.util.HashMap;
  
+ import org.apache.commons.lang.StringUtils;
  import org.apache.log4j.Logger;
+ import org.oscarehr.common.hl7.v2.oscar_to_oscar.DynamicHapiLoaderUtils;
+ import org.oscarehr.util.MiscUtils;
  
  import oscar.util.UtilDateUtilities;
  import ca.uhn.hl7v2.HL7Exception;
  
  /**
***************
*** 33,38 ****
  public class MDSHandler implements MessageHandler {
      
!     Message msg = null;
!     Terser terser;
      ArrayList obrGroups = null;
      HashMap headerMaps = new HashMap();
--- 31,36 ----
  public class MDSHandler implements MessageHandler {
      
!     Object msg = null;
!     Object terser;
      ArrayList obrGroups = null;
      HashMap headerMaps = new HashMap();
***************
*** 44,105 ****
      
      public void init(String hl7Body) throws HL7Exception {
!         
!         MdsParser p = new MdsParser();
!         p.setValidationContext(new NoValidation());
!         msg = p.parse(hl7Body.replace( "\n", "\r\n"));
!         
!         terser = new Terser(msg);
!         
!         int obrCount = getOBRCount();
!         int obrNum;
!         boolean obrFlag;
!         String segmentName;
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         obrGroups = new ArrayList();
!         /*
!          *  Fill the OBX array list for use by future methods
!          */
!         for (int i=0; i < obrCount; i++){
!             ArrayList obxSegs = new ArrayList();
!             int count = 0;
!             
!             if (i == 0){
!                 try{
!                     while(terser.get("/.OBX("+count+")-1-1") != null){
!                         obxSegs.add("/.OBX("+count+")");
!                         count++;
!                     }
!                 }catch(Exception e){
!                     //ignore exception
!                 }
!             }
!             
!             obrNum = i+1;
!             obrFlag = false;
!             for (int k=0; k < segments.length; k++){
!                 
!                 segmentName = segments[k].substring(0, 3);
!                 
!                 if (obrFlag && segmentName.equals("OBX")){
!                     if (!segments[k].equals("OBX")) // would have already been added to first array
!                         obxSegs.add("/."+segments[k]);
!                 }else if (obrFlag && segmentName.equals("OBR")){
!                     break;
!                 }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){
!                     obrFlag = true;
!                 }
!                 
!             }
!             obrGroups.add(obxSegs);
!         }
!         /*
!         for(int i=0; i<obrGroups.size(); i++){
!             ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!             for (int j=0; j < obxSegs.size(); j++){
!                 String obx = (String) obxSegs.get(j);
!                 //logger.info("OBRSEG("+i+") OBXSEG("+j+"): "+obx);
!             }
          }
-          */
      }
      
--- 42,111 ----
      
      public void init(String hl7Body) throws HL7Exception {
!     	hl7Body=StringUtils.trimToNull(hl7Body);
!     	if (hl7Body==null)
!     	{
!     		logger.error("Some one called MDSHandler.init with null data");
!     		return;
!     	}
!     	
!     	
!     	try {
! 	        msg=DynamicHapiLoaderUtils.parseMdsMsg(hl7Body.replace( "\n", "\r\n"));
! 	        terser = DynamicHapiLoaderUtils.getMdsTerser(msg);
! 	        
! 	        int obrCount = getOBRCount();
! 	        int obrNum;
! 	        boolean obrFlag;
! 	        String segmentName;
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        obrGroups = new ArrayList();
! 	        /*
! 	         *  Fill the OBX array list for use by future methods
! 	         */
! 	        for (int i=0; i < obrCount; i++){
! 	            ArrayList obxSegs = new ArrayList();
! 	            int count = 0;
! 	            
! 	            if (i == 0){
! 	                try{
! 	                    while(DynamicHapiLoaderUtils.terserGet(terser, "/.OBX("+count+")-1-1") != null){
! 	                        obxSegs.add("/.OBX("+count+")");
! 	                        count++;
! 	                    }
! 	                }catch(Exception e){
! 	                    //ignore exception
! 	                }
! 	            }
! 	            
! 	            obrNum = i+1;
! 	            obrFlag = false;
! 	            for (int k=0; k < segments.length; k++){
! 	                
! 	                segmentName = segments[k].substring(0, 3);
! 	                
! 	                if (obrFlag && segmentName.equals("OBX")){
! 	                    if (!segments[k].equals("OBX")) // would have already been added to first array
! 	                        obxSegs.add("/."+segments[k]);
! 	                }else if (obrFlag && segmentName.equals("OBR")){
! 	                    break;
! 	                }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){
! 	                    obrFlag = true;
! 	                }
! 	                
! 	            }
! 	            obrGroups.add(obxSegs);
! 	        }
! 	        /*
! 	        for(int i=0; i<obrGroups.size(); i++){
! 	            ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	            for (int j=0; j < obxSegs.size(); j++){
! 	                String obx = (String) obxSegs.get(j);
! 	                //logger.info("OBRSEG("+i+") OBXSEG("+j+"): "+obx);
! 	            }
! 	        }
! 	         */
!         } catch (Exception e) {
!         	logger.error("Unexpected error", e);
          }
      }
      
***************
*** 113,120 ****
          String priority = "R";
          try{
!             priority = terser.get("/.OBR-27-1");
              while(priority != null){
                  i++;
!                 priority = terser.get("/.OBR"+i+"-27-1");
                  if (!priority.equalsIgnoreCase("R")){
                      break;
--- 119,126 ----
          String priority = "R";
          try{
!             priority = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-27-1");
              while(priority != null){
                  i++;
!                 priority = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-27-1");
                  if (!priority.equalsIgnoreCase("R")){
                      break;
***************
*** 141,148 ****
              String test;
              try{
!                 test = terser.get("/.OBR-2-1");
                  while(test != null){
                      i++;
!                     test = terser.get("/.OBR"+i+"-2-1");
                  }
              }catch(Exception e){
--- 147,154 ----
              String test;
              try{
!                 test = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-2-1");
                  while(test != null){
                      i++;
!                     test = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-2-1");
                  }
              }catch(Exception e){
***************
*** 177,183 ****
          try{
              if (i == 1){
!                 timeStamp = formatDateTime(getString(terser.get("/.OBR-7-1")));
              }else{
!                 timeStamp = formatDateTime(getString(terser.get("/.OBR"+i+"-7-1")));
              }
              return(timeStamp);
--- 183,189 ----
          try{
              if (i == 1){
!                 timeStamp = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-7-1")));
              }else{
!                 timeStamp = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-7-1")));
              }
              return(timeStamp);
***************
*** 264,268 ****
          int count = 0;
          try {
!             String accessionNum = getString(terser.get("/.MSH-10-1"));
              count = Integer.parseInt(accessionNum.substring(accessionNum.lastIndexOf("-")+1));
          } catch (Exception e) {
--- 270,274 ----
          int count = 0;
          try {
!             String accessionNum = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.MSH-10-1"));
              count = Integer.parseInt(accessionNum.substring(accessionNum.lastIndexOf("-")+1));
          } catch (Exception e) {
***************
*** 285,290 ****
          try{
              
!             nextHeaderNum = terser.get("/.ZRG(0)-2-1");
!             nextHeader = getString(terser.get("/.ZRG(0)-7-1"));
              headerNum = nextHeaderNum;
              while(nextHeaderNum != null){
--- 291,296 ----
          try{
              
!             nextHeaderNum = DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG(0)-2-1");
!             nextHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG(0)-7-1"));
              headerNum = nextHeaderNum;
              while(nextHeaderNum != null){
***************
*** 298,302 ****
                      
                      if (currentHeader.equals(""))
!                         currentHeader = getString(terser.get("/.ZRG("+(i-1)+")-5-1"));
                      
                      headerMaps.put(headerNum, currentHeader);
--- 304,308 ----
                      
                      if (currentHeader.equals(""))
!                         currentHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+(i-1)+")-5-1"));
                      
                      headerMaps.put(headerNum, currentHeader);
***************
*** 307,316 ****
                  
                  i++;
!                 nextHeaderNum = terser.get("/.ZRG("+i+")-2-1");
!                 nextHeader = getString(terser.get("/.ZRG("+i+")-7-1"));
                  
              }
              if (currentHeader.equals(""))
!                 currentHeader = getString(terser.get("/.ZRG("+(i-1)+")-5-1"));
              
              headerMaps.put(headerNum, currentHeader);
--- 313,322 ----
                  
                  i++;
!                 nextHeaderNum = DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+i+")-2-1");
!                 nextHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+i+")-7-1"));
                  
              }
              if (currentHeader.equals(""))
!                 currentHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+(i-1)+")-5-1"));
              
              headerMaps.put(headerNum, currentHeader);
***************
*** 341,432 ****
       */
      public int getOBXCommentCount(int i, int j){
!         // jth obx of the ith obr
!         
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!         String obxSeg = ((String) obxSegs.get(j)).substring(2);
!         
!         // if the obxSeg is part of the first obx array
!         if (obxSeg.charAt(3) == '('){
!             
!             if(j+1 == obxSegs.size()){
!                 obxSeg = obxSeg.substring(0, 3);
!             }else{
!                 String nextObxSeg = ((String) obxSegs.get(j+1)).substring(2);
!                 if (nextObxSeg.charAt(3) == '('){
!                     return(0);
!                 }else{
!                     obxSeg = obxSeg.substring(0, 3);
!                 }
!             }
!             
!         }
!         
!         int k = 0;
!         while(!obxSeg.equals(segments[k])){
!             k++;
!         }
!         
!         int count = 0;
!         k++;
!         while (k < segments.length && segments[k].substring(0, 3).equals("NTE")){
!             k++;
!             count++;
          }
-         
-         return(count);
      }
      
      public String getOBXComment(int i, int j, int k){
          
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!         String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 
!         // if the obxSeg is part of the first obx array
!         if (obxSeg.charAt(3) == '('){
!             obxSeg = obxSeg.substring(0, 3);
!         }
!         
!         int l = 0;
!         while(!obxSeg.equals(segments[l])){
!             l++;
!         }
!         
!         l = l+k+1; // at this point, l is pointing at the NTE segment
!         
!         try{
!             Structure[] nteSegs = terser.getFinder().getRoot().getAll(segments[l]);
!             if (getString(terser.get("/."+segments[l]+"-2-1")).equals("MC")){
!               String comment = "";
!               for (int x=0; x < nteSegs.length; x++){
!                 
!                 int m = 0;
!                 int count = 0;
!                 Segment nteSeg = (Segment) nteSegs[x];
!                 String commentCode = getString(terser.get(nteSeg,3,0,2,1));
!                 String matchCommentCode = terser.get("/.ZMC("+m+")-2-1");
!                 while(matchCommentCode != null){
!                     
!                     if (matchCommentCode.equals(commentCode)){
!                         if (comment.equals(""))
!                             comment = getString(terser.get("/.ZMC("+m+")-6-1"));
!                         else
!                             comment = comment+"<br />"+getString(terser.get("/.ZMC("+m+")-6-1"));
!                     }
!                     
!                     m++;
!                     matchCommentCode = terser.get("/.ZMC("+m+")-2-1");
!                 }
!               }
!               return(comment);
!                 
!             }else{
!                 return(getString(terser.get("/."+segments[l]+"-3-2")));
!             }
!         }catch(Exception e){
!             logger.error("Could not retrieve OBX comments", e);
!             
!             return("");
          }
      }
--- 347,448 ----
       */
      public int getOBXCommentCount(int i, int j){
!         try {
! 	        // jth obx of the ith obr
! 	        
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	        String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 	        
! 	        // if the obxSeg is part of the first obx array
! 	        if (obxSeg.charAt(3) == '('){
! 	            
! 	            if(j+1 == obxSegs.size()){
! 	                obxSeg = obxSeg.substring(0, 3);
! 	            }else{
! 	                String nextObxSeg = ((String) obxSegs.get(j+1)).substring(2);
! 	                if (nextObxSeg.charAt(3) == '('){
! 	                    return(0);
! 	                }else{
! 	                    obxSeg = obxSeg.substring(0, 3);
! 	                }
! 	            }
! 	            
! 	        }
! 	        
! 	        int k = 0;
! 	        while(!obxSeg.equals(segments[k])){
! 	            k++;
! 	        }
! 	        
! 	        int count = 0;
! 	        k++;
! 	        while (k < segments.length && segments[k].substring(0, 3).equals("NTE")){
! 	            k++;
! 	            count++;
! 	        }
! 	        
! 	        return(count);
!         } catch (Exception e) {
! 	        logger.error("Unexpected error", e);
! 	        return(-1);
          }
      }
      
      public String getOBXComment(int i, int j, int k){
          
!     	try
!     	{
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	        String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 	
! 	        // if the obxSeg is part of the first obx array
! 	        if (obxSeg.charAt(3) == '('){
! 	            obxSeg = obxSeg.substring(0, 3);
! 	        }
! 	        
! 	        int l = 0;
! 	        while(!obxSeg.equals(segments[l])){
! 	            l++;
! 	        }
! 	        
! 	        l = l+k+1; // at this point, l is pointing at the NTE segment
! 	        
! 	        try{
! 	            Object[] nteSegs = DynamicHapiLoaderUtils.terser_getFinder_getRoot_getAll(terser,segments[l]);
! 	            if (getString(DynamicHapiLoaderUtils.terserGet(terser,"/."+segments[l]+"-2-1")).equals("MC")){
! 	              String comment = "";
! 	              for (int x=0; x < nteSegs.length; x++){
! 	                
! 	                int m = 0;
! 	                Object nteSeg = nteSegs[x];
! 	                String commentCode = getString(DynamicHapiLoaderUtils.terserGet(terser,nteSeg,3,0,2,1));
! 	                String matchCommentCode = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-2-1");
! 	                while(matchCommentCode != null){
! 	                    
! 	                    if (matchCommentCode.equals(commentCode)){
! 	                        if (comment.equals(""))
! 	                            comment = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-6-1"));
! 	                        else
! 	                            comment = comment+"<br />"+getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-6-1"));
! 	                    }
! 	                    
! 	                    m++;
! 	                    matchCommentCode = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-2-1");
! 	                }
! 	              }
! 	              return(comment);
! 	                
! 	            }else{
! 	                return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/."+segments[l]+"-3-2")));
! 	            }
! 	        }catch(Exception e){
! 	            logger.error("Could not retrieve OBX comments", e);
! 	            
! 	            return("");
! 	        }
!     	} catch (Exception e) {
! 	        logger.error("Unexpected error", e);
! 	        return(null);
          }
      }
***************
*** 442,447 ****
      public String getFirstName(){
          try {
!             return(getString(terser.get("/.PID-5-2")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 458,463 ----
      public String getFirstName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-2")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 450,455 ****
      public String getLastName(){
          try {
!             return(getString(terser.get("/.PID-5-1")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 466,471 ----
      public String getLastName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-1")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 458,463 ****
      public String getMiddleName(){
          try {
!             return(getString(terser.get("/.PID-5-3")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 474,479 ----
      public String getMiddleName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-3")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 470,474 ****
      public String getDOB(){
          try{
!             return(formatDateTime(getString(terser.get("/.PID-7-1"))).substring(0, 10));
          }catch(Exception e){
              logger.error("Error retrieving date of birth", e);
--- 486,490 ----
      public String getDOB(){
          try{
!             return(formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-7-1"))).substring(0, 10));
          }catch(Exception e){
              logger.error("Error retrieving date of birth", e);
***************
*** 494,498 ****
      public String getSex(){
          try{
!             return(getString(terser.get("/.PID-8-1")));
          }catch(Exception e){
              return("");
--- 510,514 ----
      public String getSex(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-8-1")));
          }catch(Exception e){
              return("");
***************
*** 502,506 ****
      public String getHealthNum(){
          try{
!             String healthNum = getString(terser.get("/.PID-19-1"));
              int end = healthNum.indexOf(" ");
              if (end > 0)
--- 518,522 ----
      public String getHealthNum(){
          try{
!             String healthNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-19-1"));
              int end = healthNum.indexOf(" ");
              if (end > 0)
***************
*** 515,519 ****
      public String getHealthNumVersion(){
          try{
!             String healthNum = getString(terser.get("/.PID-19-1"));
              return(healthNum.substring(healthNum.indexOf(" ")+1));
          }catch(Exception e){
--- 531,535 ----
      public String getHealthNumVersion(){
          try{
!             String healthNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-19-1"));
              return(healthNum.substring(healthNum.indexOf(" ")+1));
          }catch(Exception e){
***************
*** 524,528 ****
      public String getHomePhone(){
          try{
!             return(getString(terser.get("/.PID-13-1")));
          }catch(Exception e){
              return("");
--- 540,544 ----
      public String getHomePhone(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-13-1")));
          }catch(Exception e){
              return("");
***************
*** 536,540 ****
      public String getPatientLocation(){
          try{
!             return(getString(terser.get("/.MSH-3-1")));
              //return(getString(terser.get("/.PV1-3-1-1")));
          }catch(Exception e){
--- 552,556 ----
      public String getPatientLocation(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-3-1")));
              //return(getString(terser.get("/.PV1-3-1-1")));
          }catch(Exception e){
***************
*** 557,561 ****
          String ret = "F";
          try{
!             if (getString(terser.get("/.ZFR-3-1")).equals("0"))
                  return("P");
              
--- 573,577 ----
          String ret = "F";
          try{
!             if (getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZFR-3-1")).equals("0"))
                  return("P");
              
***************
*** 565,569 ****
              // If one of the zfr segments says partial, the lab should be marked
              // as a partial lab
!             while ((status = terser.get("/.ZFR("+i+")-3-1")) != null){
                  if (status.equals("0")){
                      ret = "P";
--- 581,585 ----
              // If one of the zfr segments says partial, the lab should be marked
              // as a partial lab
!             while ((status = DynamicHapiLoaderUtils.terserGet(terser,"/.ZFR("+i+")-3-1")) != null){
                  if (status.equals("0")){
                      ret = "P";
***************
*** 580,584 ****
      public String getClientRef(){
          try{
!             String clientNum = getString(terser.get("/.MSH-10-1"));
              int firstDash = clientNum.indexOf("-");
              return(clientNum.substring(0, firstDash));
--- 596,600 ----
      public String getClientRef(){
          try{
!             String clientNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              int firstDash = clientNum.indexOf("-");
              return(clientNum.substring(0, firstDash));
***************
*** 590,594 ****
      public String getDocNum(){
          try{
!             return(terser.get("/.PV1-8-1").replace("-", ""));
          }catch(Exception e){
              return("");
--- 606,610 ----
      public String getDocNum(){
          try{
!             return(DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-8-1").replace("-", ""));
          }catch(Exception e){
              return("");
***************
*** 598,602 ****
      public String getAccessionNum(){
          try{
!             String accessionNum = getString(terser.get("/.MSH-10-1"));
              int firstDash = accessionNum.indexOf("-");
              int secondDash = accessionNum.indexOf("-", firstDash+1);
--- 614,618 ----
      public String getAccessionNum(){
          try{
!             String accessionNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              int firstDash = accessionNum.indexOf("-");
              int secondDash = accessionNum.indexOf("-", firstDash+1);
***************
*** 633,643 ****
          String docNum;
          try{
!             if ((docNum = terser.get("/.PV1-8-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = terser.get("/.PV1-9-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = terser.get("/.PV1-17-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
--- 649,659 ----
          String docNum;
          try{
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-8-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-9-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-17-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
***************
*** 655,659 ****
          
          try{
!             String typeField = getString(terser.get("/.MSH-10-1"));
              char typeNum = typeField.charAt(typeField.indexOf('-', typeField.indexOf('-')+1)+1);
              
--- 671,675 ----
          
          try{
!             String typeField = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              char typeNum = typeField.charAt(typeField.indexOf('-', typeField.indexOf('-')+1)+1);
              
***************
*** 678,682 ****
          
          try{
!             String dateString = formatDateTime(getString(terser.get("/.MSH-7-1")));
              return(dateString);
          }catch(Exception e){
--- 694,698 ----
          
          try{
!             String dateString = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-7-1")));
              return(dateString);
          }catch(Exception e){
***************
*** 689,696 ****
          Date date = null;
          try{
!             date = getDateTime(getString(terser.get("/.MSH-7-1"))); 
          }catch(Exception e){
              //Not sure what to do here
!             e.printStackTrace();
          }
          return date;
--- 705,712 ----
          Date date = null;
          try{
!             date = getDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-7-1"))); 
          }catch(Exception e){
              //Not sure what to do here
!             MiscUtils.getLogger().error("Error", e);
          }
          return date;
***************
*** 702,706 ****
          
          try{
!             return(getString(terser.get(obxSeg+"-"+field)));
          }catch(Exception e){
              return("");
--- 718,722 ----
          
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,obxSeg+"-"+field)));
          }catch(Exception e){
              return("");
***************
*** 714,720 ****
          String headerNum = "null";
          try{
!             String zmnNum = terser.get("/.ZMN(0)-8-1");
              
!             String obxNum = terser.get(obxSeg+"-4-1");
              // we only need the last section of the headerNum
              obxNum = obxNum.substring(obxNum.indexOf("-", obxNum.indexOf("-")+1)+1);
--- 730,736 ----
          String headerNum = "null";
          try{
!             String zmnNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN(0)-8-1");
              
!             String obxNum = DynamicHapiLoaderUtils.terserGet(terser,obxSeg+"-4-1");
              // we only need the last section of the headerNum
              obxNum = obxNum.substring(obxNum.indexOf("-", obxNum.indexOf("-")+1)+1);
***************
*** 722,730 ****
              while(zmnNum != null){
                  if (zmnNum.equals(obxNum)){
!                     headerNum = terser.get("/.ZMN("+i+")-10-1");
                      break;
                  }
                  i++;
!                 zmnNum = terser.get("/.ZMN("+i+")-8-1");
              }
              
--- 738,746 ----
              while(zmnNum != null){
                  if (zmnNum.equals(obxNum)){
!                     headerNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN("+i+")-10-1");
                      break;
                  }
                  i++;
!                 zmnNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN("+i+")-8-1");
              }
              
***************
*** 744,760 ****
          String temp;
          
!         // get name prefix ie/ DR.
!         temp = terser.get(docSeg+"6");
!         if(temp != null)
!             docName = temp;
!         
!         // get the name
!         temp = terser.get(docSeg+"2");
!         if(temp != null){
!             if (docName.equals("")){
!                 docName = temp;
!             }else{
!                 docName = docName +" "+ temp;
!             }
          }
          
--- 760,780 ----
          String temp;
          
!         try {
! 	        // get name prefix ie/ DR.
! 	        temp = DynamicHapiLoaderUtils.terserGet(terser,docSeg+"6");
! 	        if(temp != null)
! 	            docName = temp;
! 	        
! 	        // get the name
! 	        temp = DynamicHapiLoaderUtils.terserGet(terser,docSeg+"2");
! 	        if(temp != null){
! 	            if (docName.equals("")){
! 	                docName = temp;
! 	            }else{
! 	                docName = docName +" "+ temp;
! 	            }
! 	        }
!         } catch (Exception e) {
! 	        logger.error("Unexpected Error.", e);
          }
          
***************
*** 813,817 ****
  
  	String getPaddedString(String originalString, int length, char paddingChar){
!            StringBuffer str = new StringBuffer(length);
             str.append(originalString);
                        
--- 833,837 ----
  
  	String getPaddedString(String originalString, int length, char paddingChar){
!            StringBuilder str = new StringBuilder(length);
             str.append(originalString);
                        
***************
*** 838,842 ****
              messageDate = dayFormatter.format(getMsgDateAsDate());
              messageTime = timeFormatter.format(getMsgDateAsDate());
!         }catch(Exception e){e.printStackTrace();}    
          
          retVal = getAuditLine(procDate, procTime, "REC",getOrderStatus(), getFormType(), getAccessionNum(), getHealthNum(), getHealthNumVersion(), getUnescapedName(),getClientRef(),messageDate, messageTime);
--- 858,862 ----
              messageDate = dayFormatter.format(getMsgDateAsDate());
              messageTime = timeFormatter.format(getMsgDateAsDate());
!         }catch(Exception e){MiscUtils.getLogger().error("Error", e);}    
          
          retVal = getAuditLine(procDate, procTime, "REC",getOrderStatus(), getFormType(), getAccessionNum(), getHealthNum(), getHealthNumVersion(), getUnescapedName(),getClientRef(),messageDate, messageTime);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar DynamicHapiLoaderUtils.java, NONE, 1.1.2.2

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15004/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar

Added Files:
      Tag: RELEASE_10_06
	DynamicHapiLoaderUtils.java 
Log Message:
mds lab patch

--- NEW FILE: DynamicHapiLoaderUtils.java ---
package org.oscarehr.common.hl7.v2.oscar_to_oscar;

import java.io.File;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;

import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.oscarehr.util.MiscUtils;

public final class DynamicHapiLoaderUtils {

	private static final Logger logger = MiscUtils.getLogger();

	private static URLClassLoader hackedHapiClassLoader;
	private static Class<?> hackedPipedParserClass;
	private static Method hackedParseMethod;
	private static Object hackedPipedParserInstance;
	private static Class<?> hackedMessageClass;
	private static Class<?> hackedSegmentClass;
	private static Method hackedEncodeMethod;
	private static Class<?> hackedTerserClass;
	private static Constructor<?> hackedTerserConstructor;
	private static Class<?> hackedTerserUtilsClass;
	private static Method hackedTerserGetMethod;
	private static Method hackedTerserGetBySegmentMethod;
	private static Method hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod;
	private static Method hackedTerserUtilsterser_getFinder_getRoot_getAllMethod;

	static{
		try
		{
			initialise();
		}
		catch (Exception e)
		{
			logger.error("Unexpected error.", e);
		}
	}
	
	private static void initialise() throws ClassNotFoundException, SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
	{
		hackedHapiClassLoader=getHackedUrlClassLoader();

		hackedPipedParserClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.parser.PipeParser");		
		hackedMessageClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.model.Message");
		hackedSegmentClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.model.Segment");
		hackedTerserClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.util.Terser");
		hackedTerserUtilsClass=hackedHapiClassLoader.loadClass("TerserUtils");

		hackedParseMethod=hackedPipedParserClass.getMethod("parse", String.class);
		hackedEncodeMethod=hackedPipedParserClass.getMethod("encode", hackedMessageClass);
		
		hackedPipedParserInstance=hackedPipedParserClass.newInstance();
		setNoValidate(hackedHapiClassLoader,hackedPipedParserClass,hackedPipedParserInstance);
		
		hackedTerserConstructor=hackedTerserClass.getConstructor(hackedMessageClass);
		hackedTerserGetMethod=hackedTerserClass.getMethod("get", String.class);
		hackedTerserGetBySegmentMethod=hackedTerserClass.getMethod("get", hackedSegmentClass, int.class, int.class, int.class, int.class);

		hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod=hackedTerserUtilsClass.getMethod("terser_getFinder_getCurrentGroup_getNames", hackedTerserClass);
		hackedTerserUtilsterser_getFinder_getRoot_getAllMethod=hackedTerserUtilsClass.getMethod("terser_getFinder_getRoot_getAll", hackedTerserClass, String.class);
	}
	
	private static URLClassLoader getHackedUrlClassLoader()
	{
		// HACKED_HAPI_51_JAR = "/hapi_libs/fork/hapi_51_fork.jar";

		URL[] urls = new URL[2];
		urls[0] = DynamicHapiLoaderUtils.class.getResource("/hapi_libs/fork/hacked_patched_hapi-0.5.1.jar");
		urls[1] = DynamicHapiLoaderUtils.class.getResource("/hapi_libs/fork/commons-logging-1.1.1.jar");
		
		if (logger.isDebugEnabled()) {
			try {
				logger.debug("jar:hacked hapi, size: "+urls[0].openStream().available());
			} catch (IOException e) {
				logger.error("Unexpected Error", e);
			}
		}
		
		URLClassLoader classLoader = new URLClassLoader(urls, null);
		return(classLoader);
	}
	
	
	private static void setNoValidate(URLClassLoader classLoader, Class<?> pipedParserClass, Object pipedParserInstance) throws ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, NoSuchMethodException
	{
		Class<?> noValidateClass=classLoader.loadClass("ca.uhn.hl7v2.validation.impl.NoValidation");
		Object noValidateInstance=noValidateClass.newInstance();
		
		Class<?> validationContextClass=classLoader.loadClass("ca.uhn.hl7v2.validation.ValidationContext");
		
		Method noValidateMethod=pipedParserClass.getMethod("setValidationContext", validationContextClass);
		noValidateMethod.invoke(pipedParserInstance, new Object[]{noValidateInstance});
	}
	
	public static Object parseMdsMsg(String hl7Text) throws IllegalAccessException, SecurityException, IllegalArgumentException, InvocationTargetException {
		Object result=hackedParseMethod.invoke(hackedPipedParserInstance, hl7Text);
		return(result);
	}

	
	public static String encodeMdsMsg(Object mdsMessage) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedEncodeMethod.invoke(hackedPipedParserInstance, mdsMessage);
		return(result);
	}
	
	public static Object getMdsTerser(Object mdsMsg) throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException
	{
		Object terser=hackedTerserConstructor.newInstance(mdsMsg);
		return(terser);
	}
	
	public static String terserGet(Object terser, String s) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedTerserGetMethod.invoke(terser, s);
		return(result);
	}

	public static String terserGet(Object terser, Object segment, int a, int b, int c, int d) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedTerserGetBySegmentMethod.invoke(terser, segment, a, b, c, d);
		return(result);
	}

	public static String[] terser_getFinder_getCurrentGroup_getNames(Object terser) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String[] result=(String[]) hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod.invoke(null, terser);
		return(result);
	}

	public static Object[] terser_getFinder_getRoot_getAll(Object terser, String segment) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		Object[] result=(Object[]) hackedTerserUtilsterser_getFinder_getRoot_getAllMethod.invoke(null, terser, segment);
		return(result);		
	}
	
	public static void main(String... argv) throws Exception {
		String hl7msg = FileUtils.readFileToString(new File("/data/git/oscar_utils/tmp/51_hl7body.txt")).trim();

		Object msg = parseMdsMsg(hl7msg);
		String result=encodeMdsMsg(msg);
		
		logger.error("--------------------");
		logger.error(result.replace("\r", "\n"));

		Object terser=getMdsTerser(msg);
		logger.error("--------------------");		
	
	}
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork hacked_patched_hapi-0.5.1.jar, NONE, 1.1.2.2 commons-logging-1.1.1.jar, NONE, 1.1.2.2 readme.txt, NONE, 1.1.2.2

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15004/web/WEB-INF/classes/hapi_libs/fork

Added Files:
      Tag: RELEASE_10_06
	hacked_patched_hapi-0.5.1.jar commons-logging-1.1.1.jar 
	readme.txt 
Log Message:
mds lab patch

--- NEW FILE: commons-logging-1.1.1.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hacked_patched_hapi-0.5.1.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: readme.txt ---
The jar files are in here because they need to be files "in the class path" not like normal library files.

These jar files are dynamically loaded upon special cases and conflict with other jars in the system so they should be left here.

Specifically this is for MDS lab uploads. When some one fixes / rewrites the MDS Lab Uploads, these can then be deleted.

These jars are referenced from DynamicHapiLoaderUtils.java

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_pl.properties, 1.9, 1.10

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1478

Modified Files:
	oscarResources_pl.properties 
Log Message:
Updates merged from 10.12

Index: oscarResources_pl.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pl.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** oscarResources_pl.properties	20 Oct 2010 00:36:02 -0000	1.9
--- oscarResources_pl.properties	9 Dec 2010 02:45:39 -0000	1.10
***************
*** 1653,1657 ****
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEnd=Koniec
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgIncludeCompleted=include ukoęczenia
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSearchon Wyszukiwanie=o odesłaniu Data
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgApptDate=Data wizyty
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency=Pośpiech
--- 1653,1657 ----
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEnd=Koniec
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgIncludeCompleted=include ukoęczenia
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSearchon=Wyszukiwanie o odesłaniu Data
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgApptDate=Data wizyty
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency=Pośpiech
***************
*** 3390,3394 ****
  admin.demographicaddrecord.msgFailed=Przepraszamy, poza nie.
  
! admin.resourcebaseurl.title Base=URL
  admin.resourcebaseurl.msgTitle=bazy zasobów URL
  admin.resourcebaseurl.formBaseUrl=Podstawowy URL: <font size='-2'> (http://oscar.mcmaster.ca np.) </ font>
--- 3390,3394 ----
  admin.demographicaddrecord.msgFailed=Przepraszamy, poza nie.
  
! admin.resourcebaseurl.title=Basa URL
  admin.resourcebaseurl.msgTitle=bazy zasob&#X0f3;w URL
  admin.resourcebaseurl.formBaseUrl=Podstawowy URL: <font size='-2'> (http://oscar.mcmaster.ca np.) </ font>
***************
*** 3657,3661 ****
  
  oscarReport.oscarReportDemoSetEdit.msgDemographic=demograficzne
! oscarReport.oscarReportDemoSetEdit.msgSetEdit Ustaw=Edycja
  oscarReport.oscarReportDemoSetEdit.msgPatientSet=pacjenta Ustaw
  oscarReport.oscarReportDemoSetEdit.msgOptionSet=- Wybierz Ustaw --
--- 3657,3661 ----
  
  oscarReport.oscarReportDemoSetEdit.msgDemographic=demograficzne
! oscarReport.oscarReportDemoSetEdit.msgSetEdit=Ustaw Edycja
  oscarReport.oscarReportDemoSetEdit.msgPatientSet=pacjenta Ustaw
  oscarReport.oscarReportDemoSetEdit.msgOptionSet=- Wybierz Ustaw --
***************
*** 3858,3862 ****
  provider.setRxProfileView.msgPrefs=Preferencje
  provider.setRxProfileView.msgProfileView=Rx profil
! provider.setRxProfileView.msgEdit Wybierz=Widok
  provider.setRxProfileView.btnSubmit=Zapisz
  provider.setRxProfileView.msgSuccess=Rx profil Zobacz zapisanych
--- 3858,3862 ----
  provider.setRxProfileView.msgPrefs=Preferencje
  provider.setRxProfileView.msgProfileView=Rx profil
! provider.setRxProfileView.msgEdit=Wybierz Widok
  provider.setRxProfileView.btnSubmit=Zapisz
  provider.setRxProfileView.msgSuccess=Rx profil Zobacz zapisanych
***************
*** 5208,5212 ****
  oscar.billing.CA.BC.title=Otrzymuj p&#X142;atno&#X15b;ci
  oscar.billing.CA.BC.invoice=Faktura # --
! oscar.billing.# CA.BC.lineNo=Linia --
  oscar.billing.CA.BC.amount=Kwota - $
  oscar.billing.CA.BC.method=metoda p&#X142;atno&#X15b;ci --
--- 5208,5212 ----
  oscar.billing.CA.BC.title=Otrzymuj p&#X142;atno&#X15b;ci
  oscar.billing.CA.BC.invoice=Faktura # --
! oscar.billing.no.CA.BC.lineNo=
  oscar.billing.CA.BC.amount=Kwota - $
  oscar.billing.CA.BC.method=metoda p&#X142;atno&#X15b;ci --
***************
*** 5234,5236 ****
  oscar.waitinglistname.removeSuccess=Oczekuj\u0105cych Nazwa listy jest pomy&#X15b;lnie usuni&#X119;te.
  
! oscarLab.System=System
\ No newline at end of file
--- 5234,5390 ----
  oscar.waitinglistname.removeSuccess=Oczekuj\u0105cych Nazwa listy jest pomy&#X15b;lnie usuni&#X119;te.
  
! oscarLab.System=System
! Error.numRows.below.zero=<li>warto\u015B\u0107 wiersz musi by\u0107 wi\u0119ksza od 0</li>\n\n
! SearchDrug.msgCustomDrugRx3=Niestandardowy lek
! eFormGenerator.inputTypeCustom=Niestandardowy texty
! eFormGenerator.imageCustom=Zwyczaj
! 
! eFormGenerator.collapse=Zwi\u0144
! eFormGenerator.collapseAll=Zwi\u0144 wszystko
! eFormGenerator.eFormName=Nazwa eForm
! eFormGenerator.expand=Rozwi\u0144
! eFormGenerator.expandAll=Rozwi\u0144 wszystko
! eFormGenerator.gender=Przypadek szczeg\u00F3lny Pola wyboru p\u0142ci
! eFormGenerator.genderCheckbox=P\u0142e\u0107 pola wyboru stosowane w tej formie? Je\u015Bli tak, kliknij tutaj
! eFormGenerator.genderFemale=Kobieta
! eFormGenerator.genderFemaleButton=Kliknij, a nast\u0119pnie kliknij w lewym g\u00F3rnym rogu pola wyboru kobiet
! eFormGenerator.genderMale=M\u0119\u017Cczyzna
! eFormGenerator.genderMaleButton=Kliknij, a nast\u0119pnie kliknij w lewym g\u00F3rnym rogu pola wyboru p\u0142ci m\u0119skiej
! eFormGenerator.generate=eForm Generowanie
! eFormGenerator.generateLoadButton=Wczytaj kod HTML w nowym oknie
! eFormGenerator.generateResetButton=Start ponownie
! eFormGenerator.generateRestoreSaveButton=Przywr\u00F3ci\u0107
! eFormGenerator.generateSaveButton=Zapisz
! eFormGenerator.generatehint1=Kod html powinien otwiera\u0107 si\u0119 w oknie edycji E-Form.
! eFormGenerator.generatehint2=Teraz trzeba wype\u0142ni\u0107 pola opisane (imi\u0119 postaci, dodatkowych informacji, itp.):
! eFormGenerator.generatehint3=Zapisz formularz, klikaj\u0105c przycisk Zapisz
! eFormGenerator.generatehint4=DONE!
! eFormGenerator.image.RedOutlinehint=Je\u015Bli obraz rozci\u0105ga eForm przesz\u0142o\u015Bci czerwon\u0105 obw\u00F3dk\u0105, ty przyci\u0119ciu obrazu zbyt d\u0142ugi i nie mie\u015Bci si\u0119 na wydruku list przedsi\u0119biorstw. Spr\u00F3buj wpisa\u0107 numer mniejsze ni\u017C 750 w &quot;Custom&quot; pola.
! eFormGenerator.imageChooseSelect=wybierz zdj\u0119cie
! eFormGenerator.imageCustom=Zwyczaj
! eFormGenerator.imageEnterInteger=(Wpisz liczb\u0119 ca\u0142kowit\u0105)
! eFormGenerator.imageLandscape=Krajobraz (szeroko\u015B\u0107 obrazu nale\u017Cy 2000 pikseli, przeskalowane do 1000 pikseli na ekranie)
! eFormGenerator.imageLoadButton=Load Image
! eFormGenerator.imageOrientation=Orientacja form:
! eFormGenerator.imagePortrait=Portret (szeroko\u015B\u0107 obrazu powinno by\u0107 1500 pikseli, przeskalowane do 750 pikseli na ekranie)
! eFormGenerator.imageUploadLink=przes\u0142a\u0107.
! eFormGenerator.imageUploadPrompt=Je\u015Bli obraz nie pojawia si\u0119 na li\u015Bcie
! eFormGenerator.input=Dodaj w p\u00F3l formularza (jeden po drugim)
! eFormGenerator.inputAuto=b) automatyczne wype\u0142nianie Input Box
! eFormGenerator.inputAutoCheck=Zaznacz pole wyboru
! eFormGenerator.inputDraw=d) Rysunek p\u00F3l
! eFormGenerator.inputDrawCheckbox=Dla p\u00F3l
! eFormGenerator.inputDrawCheckboxhint=Kliknij lewym g\u00F3rnym rogu pole wyboru
! eFormGenerator.inputDrawText=Na jedno i wielo-tekstowych pokryte:
! eFormGenerator.inputDrawTexthint=Przeci\u0105gnij pola z lewego g\u00F3rnego rogu do prawym dolnym rogu okna.
! eFormGenerator.inputDrawUndoButton=Cofnij
! eFormGenerator.inputDrawhint=Powt\u00F3rz krok nr 3 do wszystkich p\u00F3l tekstowych s\u0105 wykonywane.
! eFormGenerator.inputFormat=c) Formatowanie pola tekstowego
! eFormGenerator.inputFormatAlign=Wyr\u00F3wnanie poziome
! eFormGenerator.inputFormatAlignCenter=Centrum
! eFormGenerator.inputFormatAlignJustify=Uzasadnia\u0107
! eFormGenerator.inputFormatAlignLeft=Pozosta\u0142o
! eFormGenerator.inputFormatAlignRight=Prawo
! eFormGenerator.inputFormatBackground=Kolor t\u0142a
! eFormGenerator.inputFormatBackgroundTransparent=przejrzysty
! eFormGenerator.inputFormatBackgroundWhite=bia\u0142y
! eFormGenerator.inputFormatBackgroundhint=Przydatne bia\u0142ym tle, aby zatuszowa\u0107 linii w polu
! eFormGenerator.inputFormatFont=Rodzina czcionek
! eFormGenerator.inputFormatSelectMono=monospace
! eFormGenerator.inputFormatSelectSans=sans-serif
! eFormGenerator.inputFormatSelectSerif=serif
! eFormGenerator.inputFormatSize=Rozmiar czcionki
! eFormGenerator.inputFormatSizehint=(W px, zwykle 12-14)
! eFormGenerator.inputFormatStyle=Styl czcionki
! eFormGenerator.inputFormatStyleItalic=kursywa
! eFormGenerator.inputFormatStyleNormal=normalny
! eFormGenerator.inputFormatWeight=Waga czcionki
! eFormGenerator.inputName=c) wyznaczenie pola:
! eFormGenerator.inputNameMeasurement=iii) Je\u015Bli chcesz, aby wyeksportowa\u0107 warto\u015Bci tego pola do Pomiar\u00F3w, zaznacz pole Rodzaj pomiaru i tutaj:
! eFormGenerator.inputNameMeasurementButton=--- BEZ ---
! eFormGenerator.inputNameMeasurementType=Rodzaj pomiaru
! eFormGenerator.inputNameMeasurementsCustom=lub niestandardowe
! eFormGenerator.inputNameMeasurementsField=Pole
! eFormGenerator.inputNameSeq=i) automatyczne sekwencyjne nazewnictwa (szybsza metoda wi\u0119kszo\u015Bci przypadk\u00F3w).
! eFormGenerator.inputNameSeqCustom=ii) Custom unikatow\u0105 nazw\u0119:
! eFormGenerator.inputNameSeqCustomhint1=Musi by\u0107 jeden ci\u0105g\u0142y s\u0142owa z liter / cyfr tylko (bez spacji / symbole)
! eFormGenerator.inputNameSeqCustomhint2=U\u017Cyj nazewnictwo \u0142atwo zidentyfikowa\u0107 odpowiedni kod html, je\u015Bli b\u0119dziemy si\u0119 edycji kodu p\u00F3\u017Aniej
! eFormGenerator.inputNameSeqPrefix=automatyczny prefiks: (jeden ci\u0105g\u0142y swovo)
! eFormGenerator.inputType=a) Wybierz Typ wej\u015Bcia
! eFormGenerator.inputTypeCheckbox=Checkbox
! eFormGenerator.inputTypeCustom=tekst Custom
! eFormGenerator.inputTypeData=Od Oscar Database
! eFormGenerator.inputTypeDataButton=--- BEZ ---
! eFormGenerator.inputTypeMeasurements=Import z pomiar\u00F3w
! eFormGenerator.inputTypeMeasurementsButton=--- BEZ ---
! eFormGenerator.inputTypeMeasurementsCustom=lub niestandardowe
! eFormGenerator.inputTypeMeasurementsField=Pole
! eFormGenerator.inputTypeMeasurementsFieldButtonComment=Komentarz
! eFormGenerator.inputTypeMeasurementsFieldButtonDateObserved=Data obserwacji
! eFormGenerator.inputTypeMeasurementsFieldButtonValue=Stosunek jako\u015Bci
! eFormGenerator.inputTypeMeasurementsType=Rodzaj pomiaru
! eFormGenerator.inputTypeText=Single-line wprowadzania tekstu
! eFormGenerator.inputTypeTextArea=Multi-line wprowadzania tekstu
! eFormGenerator.loadImage=Load Zdiencie
! eFormGenerator.misc=Inne opcje
! eFormGenerator.miscCheckmarks=Wyr\u00F3\u017Cnij Checkmarks
! eFormGenerator.miscCheckmarksDraw=&quot;Rysunek&quot; w pozycji opcji podczas drukowania. Pracuje dla Firefoksa starszych ni\u017C 3.5, ju\u017C kod i mo\u017Ce nie dzia\u0142a\u0107 w IE.
! eFormGenerator.miscCheckmarksScale=Zwi\u0119kszanie pola wyboru. (Dotyczy Firefox 3.5 lub nowszy, Safari (WebKit lub podobne) 3.1 lub nowsza, IE 5-7 lub IE 8 dzia\u0142a w trybie zgodno\u015Bci, Opera 10.5)
! eFormGenerator.miscMax=Maksymalizuj okno, gdy \u0142aduje formularzy elektronicznych.
! eFormGenerator.miscMaxhint=Przydatne dla ni\u017Cszych rozdzielczo\u015Bci monitor\u00F3w.
! eFormGenerator.nameInstruction=Wprowad\u017A nazw\u0119 formularza tutaj
! eFormGenerator.signature=Szczeg\u00F3lny przypadek z podpisami
! eFormGenerator.signatureAddButton=Dodaj do listy
! eFormGenerator.signatureCheckbox=Dodaj podpis do tej formy
! eFormGenerator.signatureEmptyButton=Pusta lista
! eFormGenerator.signatureFragment=Nazwa u\u017Cytkownika (np. oscarDB CURRENT_USER =) - jako skr\u00F3t, mo\u017Cesz wprowadzi\u0107 kr\u00F3tki fragment nazwy, tak d\u0142ugo, jak tego segmentu jest wyj\u0105tkowa w\u015Br\u00F3d wszystkich u\u017Cytkownik\u00F3w:
! eFormGenerator.signatureFreehand=Dodaj obszarze rysowania &quot;znak&quot; podpis &quot;w locie&quot;
! eFormGenerator.signatureImage=Odpowiedni plik obrazu podpisu:
! eFormGenerator.signatureLoad=Automatycznie za\u0142adowa\u0107 zdj\u0119\u0107 podpis u\u017Cytkownika
! eFormGenerator.signatureLocationButton=Kliknij tutaj, a nast\u0119pnie przeci\u0105gnij ramk\u0119 wok\u00F3\u0142 podpisu
! eFormGenerator.title=OSCAR e-Form Generator
! eFormGenerator.tuning=Dostrajaj\u0105ce p\u00F3l wej\u015Bciowych
! eFormGenerator.tuningAlignButton=Wyr\u00F3wnaj
! eFormGenerator.tuningAllButton=Zaznacz wszystko
! eFormGenerator.tuningDecreaseButton=Zmniejsz
! eFormGenerator.tuningDeleteButton=Usu\u0144
! eFormGenerator.tuningDown=W d\u00F3\u0142
! eFormGenerator.tuningHeight=WYSOKO\u015A\u0106
! eFormGenerator.tuningIncreaseButton=Zwi\u0119ksz
! eFormGenerator.tuningLeft=LEWY
! eFormGenerator.tuningNoneButton=Odznacz wszystko
! eFormGenerator.tuningNudgeButton=Szturcha\u0107
! eFormGenerator.tuningRight=PRAWO
! eFormGenerator.tuningShiftButton=Shift
! eFormGenerator.tuningShowButton=Poka\u017C / Ukryj nazw wej\u015B\u0107
! eFormGenerator.tuningUpButton=DO GORY
! eFormGenerator.tuningWidth=SZEROKOSC
! eform.uploadhtml.btnRoleType=Rola Typ
! eform.uploadhtml.patientIndependent=Pacjent Niezale\u017Cny\n
! eFormGenerator.inputFormatWeightBold=stromy
! eFormGenerator.inputFormatWeightBolder=\u015Bmielsze
! eFormGenerator.inputFormatWeightLighter=lekki
! error.general=og\u00F3lny
! global.abnormal=Nieprawid\u0142owy
! global.btncourseview=Kursy
! global.courseview=Kursy
! global.Document=Dokument
! global.hl7=HL7
! global.inbox=Skrzynka
! global.macro=Macro
! global.menu=Menu
! global.normal=Normalna
! global.today=dzisiaj
! global.viewOcularProcedure=Procedury oka
! global.viewSpecsHistory=Historia Ocularow
! admin.admin.AddNewQueue=Dodaj kolejka
! admin.admin.diseaseRegister=Rapport Rejestru Chor\u00F3b
! admin.admin.learning=OSCAR Nauka
! admin.admin.learning.importPatient=Import danych pacjenta
! admin.admin.learning.importStudent=Student importu danych
! admin.admin.learning.manageCourses=Zarz\u0105dzanie Kursy
! admin.admin.manageFacilities=Zarz\u0105dzanie obiektami
! admin.admin.misRpt=Raport MIS
! admin.admin.ocanRpt=OCAN Raport
! admin.admin.reconciliationReport=Pojednania
! admin.admin.sendOruR01=Wysy\u0142anie danych drog\u0105 elektroniczn\u0105 do innego Oscar
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_pl.properties, 1.9, 1.9.2.1

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26565

Modified Files:
      Tag: RELEASE_10_12
	oscarResources_pl.properties 
Log Message:
initial translation of almost half the missing tags

Index: oscarResources_pl.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pl.properties,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** oscarResources_pl.properties	20 Oct 2010 00:36:02 -0000	1.9
--- oscarResources_pl.properties	8 Dec 2010 23:37:56 -0000	1.9.2.1
***************
*** 1653,1657 ****
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEnd=Koniec
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgIncludeCompleted=include ukoęczenia
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSearchon Wyszukiwanie=o odesłaniu Data
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgApptDate=Data wizyty
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency=Pośpiech
--- 1653,1657 ----
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEnd=Koniec
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgIncludeCompleted=include ukoęczenia
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSearchon Wyszukiwanie o odesłaniu Data
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgApptDate=Data wizyty
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency=Pośpiech
***************
*** 3390,3394 ****
  admin.demographicaddrecord.msgFailed=Przepraszamy, poza nie.
  
! admin.resourcebaseurl.title Base=URL
  admin.resourcebaseurl.msgTitle=bazy zasobów URL
  admin.resourcebaseurl.formBaseUrl=Podstawowy URL: <font size='-2'> (http://oscar.mcmaster.ca np.) </ font>
--- 3390,3394 ----
  admin.demographicaddrecord.msgFailed=Przepraszamy, poza nie.
  
! admin.resourcebaseurl.title Basa URL
  admin.resourcebaseurl.msgTitle=bazy zasob&#X0f3;w URL
  admin.resourcebaseurl.formBaseUrl=Podstawowy URL: <font size='-2'> (http://oscar.mcmaster.ca np.) </ font>
***************
*** 3657,3661 ****
  
  oscarReport.oscarReportDemoSetEdit.msgDemographic=demograficzne
! oscarReport.oscarReportDemoSetEdit.msgSetEdit Ustaw=Edycja
  oscarReport.oscarReportDemoSetEdit.msgPatientSet=pacjenta Ustaw
  oscarReport.oscarReportDemoSetEdit.msgOptionSet=- Wybierz Ustaw --
--- 3657,3661 ----
  
  oscarReport.oscarReportDemoSetEdit.msgDemographic=demograficzne
! oscarReport.oscarReportDemoSetEdit.msgSetEdit Ustaw Edycja
  oscarReport.oscarReportDemoSetEdit.msgPatientSet=pacjenta Ustaw
  oscarReport.oscarReportDemoSetEdit.msgOptionSet=- Wybierz Ustaw --
***************
*** 3858,3862 ****
  provider.setRxProfileView.msgPrefs=Preferencje
  provider.setRxProfileView.msgProfileView=Rx profil
! provider.setRxProfileView.msgEdit Wybierz=Widok
  provider.setRxProfileView.btnSubmit=Zapisz
  provider.setRxProfileView.msgSuccess=Rx profil Zobacz zapisanych
--- 3858,3862 ----
  provider.setRxProfileView.msgPrefs=Preferencje
  provider.setRxProfileView.msgProfileView=Rx profil
! provider.setRxProfileView.msgEdit Wybierz Widok
  provider.setRxProfileView.btnSubmit=Zapisz
  provider.setRxProfileView.msgSuccess=Rx profil Zobacz zapisanych
***************
*** 5208,5212 ****
  oscar.billing.CA.BC.title=Otrzymuj p&#X142;atno&#X15b;ci
  oscar.billing.CA.BC.invoice=Faktura # --
! oscar.billing.# CA.BC.lineNo=Linia --
  oscar.billing.CA.BC.amount=Kwota - $
  oscar.billing.CA.BC.method=metoda p&#X142;atno&#X15b;ci --
--- 5208,5212 ----
  oscar.billing.CA.BC.title=Otrzymuj p&#X142;atno&#X15b;ci
  oscar.billing.CA.BC.invoice=Faktura # --
! oscar.billing.no.CA.BC.lineNo=
  oscar.billing.CA.BC.amount=Kwota - $
  oscar.billing.CA.BC.method=metoda p&#X142;atno&#X15b;ci --
***************
*** 5234,5236 ****
  oscar.waitinglistname.removeSuccess=Oczekuj\u0105cych Nazwa listy jest pomy&#X15b;lnie usuni&#X119;te.
  
! oscarLab.System=System
\ No newline at end of file
--- 5234,5390 ----
  oscar.waitinglistname.removeSuccess=Oczekuj\u0105cych Nazwa listy jest pomy&#X15b;lnie usuni&#X119;te.
  
! oscarLab.System=System
! Error.numRows.below.zero=<li>warto\u015B\u0107 wiersz musi by\u0107 wi\u0119ksza od 0</li>\n\n
! SearchDrug.msgCustomDrugRx3=Niestandardowy lek
! eFormGenerator.inputTypeCustom=Niestandardowy texty
! eFormGenerator.imageCustom=Zwyczaj
! 
! eFormGenerator.collapse=Zwi\u0144
! eFormGenerator.collapseAll=Zwi\u0144 wszystko
! eFormGenerator.eFormName=Nazwa eForm
! eFormGenerator.expand=Rozwi\u0144
! eFormGenerator.expandAll=Rozwi\u0144 wszystko
! eFormGenerator.gender=Przypadek szczeg\u00F3lny Pola wyboru p\u0142ci
! eFormGenerator.genderCheckbox=P\u0142e\u0107 pola wyboru stosowane w tej formie? Je\u015Bli tak, kliknij tutaj
! eFormGenerator.genderFemale=Kobieta
! eFormGenerator.genderFemaleButton=Kliknij, a nast\u0119pnie kliknij w lewym g\u00F3rnym rogu pola wyboru kobiet
! eFormGenerator.genderMale=M\u0119\u017Cczyzna
! eFormGenerator.genderMaleButton=Kliknij, a nast\u0119pnie kliknij w lewym g\u00F3rnym rogu pola wyboru p\u0142ci m\u0119skiej
! eFormGenerator.generate=eForm Generowanie
! eFormGenerator.generateLoadButton=Wczytaj kod HTML w nowym oknie
! eFormGenerator.generateResetButton=Start ponownie
! eFormGenerator.generateRestoreSaveButton=Przywr\u00F3ci\u0107
! eFormGenerator.generateSaveButton=Zapisz
! eFormGenerator.generatehint1=Kod html powinien otwiera\u0107 si\u0119 w oknie edycji E-Form.
! eFormGenerator.generatehint2=Teraz trzeba wype\u0142ni\u0107 pola opisane (imi\u0119 postaci, dodatkowych informacji, itp.):
! eFormGenerator.generatehint3=Zapisz formularz, klikaj\u0105c przycisk Zapisz
! eFormGenerator.generatehint4=DONE!
! eFormGenerator.image.RedOutlinehint=Je\u015Bli obraz rozci\u0105ga eForm przesz\u0142o\u015Bci czerwon\u0105 obw\u00F3dk\u0105, ty przyci\u0119ciu obrazu zbyt d\u0142ugi i nie mie\u015Bci si\u0119 na wydruku list przedsi\u0119biorstw. Spr\u00F3buj wpisa\u0107 numer mniejsze ni\u017C 750 w &quot;Custom&quot; pola.
! eFormGenerator.imageChooseSelect=wybierz zdj\u0119cie
! eFormGenerator.imageCustom=Zwyczaj
! eFormGenerator.imageEnterInteger=(Wpisz liczb\u0119 ca\u0142kowit\u0105)
! eFormGenerator.imageLandscape=Krajobraz (szeroko\u015B\u0107 obrazu nale\u017Cy 2000 pikseli, przeskalowane do 1000 pikseli na ekranie)
! eFormGenerator.imageLoadButton=Load Image
! eFormGenerator.imageOrientation=Orientacja form:
! eFormGenerator.imagePortrait=Portret (szeroko\u015B\u0107 obrazu powinno by\u0107 1500 pikseli, przeskalowane do 750 pikseli na ekranie)
! eFormGenerator.imageUploadLink=przes\u0142a\u0107.
! eFormGenerator.imageUploadPrompt=Je\u015Bli obraz nie pojawia si\u0119 na li\u015Bcie
! eFormGenerator.input=Dodaj w p\u00F3l formularza (jeden po drugim)
! eFormGenerator.inputAuto=b) automatyczne wype\u0142nianie Input Box
! eFormGenerator.inputAutoCheck=Zaznacz pole wyboru
! eFormGenerator.inputDraw=d) Rysunek p\u00F3l
! eFormGenerator.inputDrawCheckbox=Dla p\u00F3l
! eFormGenerator.inputDrawCheckboxhint=Kliknij lewym g\u00F3rnym rogu pole wyboru
! eFormGenerator.inputDrawText=Na jedno i wielo-tekstowych pokryte:
! eFormGenerator.inputDrawTexthint=Przeci\u0105gnij pola z lewego g\u00F3rnego rogu do prawym dolnym rogu okna.
! eFormGenerator.inputDrawUndoButton=Cofnij
! eFormGenerator.inputDrawhint=Powt\u00F3rz krok nr 3 do wszystkich p\u00F3l tekstowych s\u0105 wykonywane.
! eFormGenerator.inputFormat=c) Formatowanie pola tekstowego
! eFormGenerator.inputFormatAlign=Wyr\u00F3wnanie poziome
! eFormGenerator.inputFormatAlignCenter=Centrum
! eFormGenerator.inputFormatAlignJustify=Uzasadnia\u0107
! eFormGenerator.inputFormatAlignLeft=Pozosta\u0142o
! eFormGenerator.inputFormatAlignRight=Prawo
! eFormGenerator.inputFormatBackground=Kolor t\u0142a
! eFormGenerator.inputFormatBackgroundTransparent=przejrzysty
! eFormGenerator.inputFormatBackgroundWhite=bia\u0142y
! eFormGenerator.inputFormatBackgroundhint=Przydatne bia\u0142ym tle, aby zatuszowa\u0107 linii w polu
! eFormGenerator.inputFormatFont=Rodzina czcionek
! eFormGenerator.inputFormatSelectMono=monospace
! eFormGenerator.inputFormatSelectSans=sans-serif
! eFormGenerator.inputFormatSelectSerif=serif
! eFormGenerator.inputFormatSize=Rozmiar czcionki
! eFormGenerator.inputFormatSizehint=(W px, zwykle 12-14)
! eFormGenerator.inputFormatStyle=Styl czcionki
! eFormGenerator.inputFormatStyleItalic=kursywa
! eFormGenerator.inputFormatStyleNormal=normalny
! eFormGenerator.inputFormatWeight=Waga czcionki
! eFormGenerator.inputName=c) wyznaczenie pola:
! eFormGenerator.inputNameMeasurement=iii) Je\u015Bli chcesz, aby wyeksportowa\u0107 warto\u015Bci tego pola do Pomiar\u00F3w, zaznacz pole Rodzaj pomiaru i tutaj:
! eFormGenerator.inputNameMeasurementButton=--- BEZ ---
! eFormGenerator.inputNameMeasurementType=Rodzaj pomiaru
! eFormGenerator.inputNameMeasurementsCustom=lub niestandardowe
! eFormGenerator.inputNameMeasurementsField=Pole
! eFormGenerator.inputNameSeq=i) automatyczne sekwencyjne nazewnictwa (szybsza metoda wi\u0119kszo\u015Bci przypadk\u00F3w).
! eFormGenerator.inputNameSeqCustom=ii) Custom unikatow\u0105 nazw\u0119:
! eFormGenerator.inputNameSeqCustomhint1=Musi by\u0107 jeden ci\u0105g\u0142y s\u0142owa z liter / cyfr tylko (bez spacji / symbole)
! eFormGenerator.inputNameSeqCustomhint2=U\u017Cyj nazewnictwo \u0142atwo zidentyfikowa\u0107 odpowiedni kod html, je\u015Bli b\u0119dziemy si\u0119 edycji kodu p\u00F3\u017Aniej
! eFormGenerator.inputNameSeqPrefix=automatyczny prefiks: (jeden ci\u0105g\u0142y swovo)
! eFormGenerator.inputType=a) Wybierz Typ wej\u015Bcia
! eFormGenerator.inputTypeCheckbox=Checkbox
! eFormGenerator.inputTypeCustom=tekst Custom
! eFormGenerator.inputTypeData=Od Oscar Database
! eFormGenerator.inputTypeDataButton=--- BEZ ---
! eFormGenerator.inputTypeMeasurements=Import z pomiar\u00F3w
! eFormGenerator.inputTypeMeasurementsButton=--- BEZ ---
! eFormGenerator.inputTypeMeasurementsCustom=lub niestandardowe
! eFormGenerator.inputTypeMeasurementsField=Pole
! eFormGenerator.inputTypeMeasurementsFieldButtonComment=Komentarz
! eFormGenerator.inputTypeMeasurementsFieldButtonDateObserved=Data obserwacji
! eFormGenerator.inputTypeMeasurementsFieldButtonValue=Stosunek jako\u015Bci
! eFormGenerator.inputTypeMeasurementsType=Rodzaj pomiaru
! eFormGenerator.inputTypeText=Single-line wprowadzania tekstu
! eFormGenerator.inputTypeTextArea=Multi-line wprowadzania tekstu
! eFormGenerator.loadImage=Load Zdiencie
! eFormGenerator.misc=Inne opcje
! eFormGenerator.miscCheckmarks=Wyr\u00F3\u017Cnij Checkmarks
! eFormGenerator.miscCheckmarksDraw=&quot;Rysunek&quot; w pozycji opcji podczas drukowania. Pracuje dla Firefoksa starszych ni\u017C 3.5, ju\u017C kod i mo\u017Ce nie dzia\u0142a\u0107 w IE.
! eFormGenerator.miscCheckmarksScale=Zwi\u0119kszanie pola wyboru. (Dotyczy Firefox 3.5 lub nowszy, Safari (WebKit lub podobne) 3.1 lub nowsza, IE 5-7 lub IE 8 dzia\u0142a w trybie zgodno\u015Bci, Opera 10.5)
! eFormGenerator.miscMax=Maksymalizuj okno, gdy \u0142aduje formularzy elektronicznych.
! eFormGenerator.miscMaxhint=Przydatne dla ni\u017Cszych rozdzielczo\u015Bci monitor\u00F3w.
! eFormGenerator.nameInstruction=Wprowad\u017A nazw\u0119 formularza tutaj
! eFormGenerator.signature=Szczeg\u00F3lny przypadek z podpisami
! eFormGenerator.signatureAddButton=Dodaj do listy
! eFormGenerator.signatureCheckbox=Dodaj podpis do tej formy
! eFormGenerator.signatureEmptyButton=Pusta lista
! eFormGenerator.signatureFragment=Nazwa u\u017Cytkownika (np. oscarDB CURRENT_USER =) - jako skr\u00F3t, mo\u017Cesz wprowadzi\u0107 kr\u00F3tki fragment nazwy, tak d\u0142ugo, jak tego segmentu jest wyj\u0105tkowa w\u015Br\u00F3d wszystkich u\u017Cytkownik\u00F3w:
! eFormGenerator.signatureFreehand=Dodaj obszarze rysowania &quot;znak&quot; podpis &quot;w locie&quot;
! eFormGenerator.signatureImage=Odpowiedni plik obrazu podpisu:
! eFormGenerator.signatureLoad=Automatycznie za\u0142adowa\u0107 zdj\u0119\u0107 podpis u\u017Cytkownika
! eFormGenerator.signatureLocationButton=Kliknij tutaj, a nast\u0119pnie przeci\u0105gnij ramk\u0119 wok\u00F3\u0142 podpisu
! eFormGenerator.title=OSCAR e-Form Generator
! eFormGenerator.tuning=Dostrajaj\u0105ce p\u00F3l wej\u015Bciowych
! eFormGenerator.tuningAlignButton=Wyr\u00F3wnaj
! eFormGenerator.tuningAllButton=Zaznacz wszystko
! eFormGenerator.tuningDecreaseButton=Zmniejsz
! eFormGenerator.tuningDeleteButton=Usu\u0144
! eFormGenerator.tuningDown=W d\u00F3\u0142
! eFormGenerator.tuningHeight=WYSOKO\u015A\u0106
! eFormGenerator.tuningIncreaseButton=Zwi\u0119ksz
! eFormGenerator.tuningLeft=LEWY
! eFormGenerator.tuningNoneButton=Odznacz wszystko
! eFormGenerator.tuningNudgeButton=Szturcha\u0107
! eFormGenerator.tuningRight=PRAWO
! eFormGenerator.tuningShiftButton=Shift
! eFormGenerator.tuningShowButton=Poka\u017C / Ukryj nazw wej\u015B\u0107
! eFormGenerator.tuningUpButton=DO GORY
! eFormGenerator.tuningWidth=SZEROKOSC
! eform.uploadhtml.btnRoleType=Rola Typ
! eform.uploadhtml.patientIndependent=Pacjent Niezale\u017Cny\n
! eFormGenerator.inputFormatWeightBold=stromy
! eFormGenerator.inputFormatWeightBolder=\u015Bmielsze
! eFormGenerator.inputFormatWeightLighter=lekki
! error.general=og\u00F3lny
! global.abnormal=Nieprawid\u0142owy
! global.btncourseview=Kursy
! global.courseview=Kursy
! global.Document=Dokument
! global.hl7=HL7
! global.inbox=Skrzynka
! global.macro=Macro
! global.menu=Menu
! global.normal=Normalna
! global.today=dzisiaj
! global.viewOcularProcedure=Procedury oka
! global.viewSpecsHistory=Historia Ocularow
! admin.admin.AddNewQueue=Dodaj kolejka
! admin.admin.diseaseRegister=Rapport Rejestru Chor\u00F3b
! admin.admin.learning=OSCAR Nauka
! admin.admin.learning.importPatient=Import danych pacjenta
! admin.admin.learning.importStudent=Student importu danych
! admin.admin.learning.manageCourses=Zarz\u0105dzanie Kursy
! admin.admin.manageFacilities=Zarz\u0105dzanie obiektami
! admin.admin.misRpt=Raport MIS
! admin.admin.ocanRpt=OCAN Raport
! admin.admin.reconciliationReport=Pojednania
! admin.admin.sendOruR01=Wysy\u0142anie danych drog\u0105 elektroniczn\u0105 do innego Oscar

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/data ProviderMyOscarIdData.java, 1.12, 1.13

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/data
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17959/web/WEB-INF/classes/src/oscar/oscarProvider/data

Modified Files:
	ProviderMyOscarIdData.java 
Log Message:
bug fix for passing around providerId

Index: ProviderMyOscarIdData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/data/ProviderMyOscarIdData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ProviderMyOscarIdData.java	6 Oct 2010 21:52:11 -0000	1.12
--- ProviderMyOscarIdData.java	8 Dec 2010 22:59:11 -0000	1.13
***************
*** 30,33 ****
--- 30,34 ----
  import java.util.List;
  
+ import org.apache.log4j.Logger;
  import org.oscarehr.util.MiscUtils;
  
***************
*** 35,166 ****
  
  /**
!  * Manages MyOscar Login Id for provider 
!  * 
   */
! public class ProviderMyOscarIdData {
!     
!     static private String strColName = "MyOscarId";    
!     private String provider;
!     
!     /** Creates a new instance of ProviderColourUpdater */
!    public ProviderMyOscarIdData(String p) {
!        provider = p;       
!     }
!    
!    public ProviderMyOscarIdData() {
!          
!     }
!    
!    /**
!     *Retrieve myOscar login id for current provider first by querying property table 
!     */
!    public static String getMyOscarId(String providerNo) {
!        String sql;
!        String myOscarId = "";
!        ResultSet rs;
!        DBHandler db;
!        
!        try {
!         
!        
!         sql = "SELECT value FROM property WHERE name = '" + strColName + "' AND provider_no = '" + providerNo + "'";
!         rs = DBHandler.GetSQL(sql);
!             
!         if( rs.next() ) {
!             myOscarId = oscar.Misc.getString(rs, "value");
!         }
!                 
!         
!        }
!        catch( SQLException ex ) {
!            MiscUtils.getLogger().error("Error", ex);           
!        }
!        
!        return myOscarId;
!    }
!       /**
!        *set myOscar login id in property table
!        */
!    public boolean setId(String id) {
!        DBHandler db;
!        String sql;
!        ResultSet rs;
!        boolean ret = true;
!        
!        try {
!                   
!         if( idIsSet() )
!            sql = "UPDATE property SET value = '" + id + "' WHERE name = '" + strColName + "' AND provider_no = '" + provider + "'";
!         else
!            sql = "INSERT INTO property (name,value,provider_no) VALUES('" + strColName + "', '" + id + "', '" + provider + "')";
!         
!         
!         DBHandler.RunSQL(sql);
!        
!        }catch( SQLException ex ) {
!            MiscUtils.getLogger().debug("Error adding provider myOscar Login Id: " + ex.getMessage());
!            ret = false;
!        }
!        
!        return ret;
!    }
!  
!    public boolean idIsSet() throws SQLException {
!        DBHandler db;
!        String sql;
!        ResultSet rs;       
!               
!        
!        sql = "SELECT value FROM property WHERE name = '" + strColName + "' AND provider_no = '" + provider + "'";
!        
!        rs = DBHandler.GetSQL(sql);
!        
!        return rs.next();              
!        
!    }
!    
!    //get provider number knowing the indivo id
!   public String getProviderNo(String myOscarId) {
!       String sql = "";
!       String providerNo = "";
!       ResultSet rs = null;
!       DBHandler db;
!       
!       try {
!           
!           
!           sql = "SELECT provider_no FROM property WHERE name = '" + strColName + "' AND value = '" + myOscarId+ "'";
!           MiscUtils.getLogger().debug(sql);
!           rs = DBHandler.GetSQL(sql);
!           
!           if( rs.next() ) {
!               providerNo = oscar.Misc.getString(rs, "provider_no");
!           }
!       } catch( SQLException ex ) {
!           MiscUtils.getLogger().error("Error", ex);
!       }
!       return providerNo;
!   }
!   
!     public static List<String> listMyOscarProviderNums() {
!       String sql;
!       String myOscarId = "";
!       ArrayList providerList = new ArrayList();
!       oscar.oscarProvider.data.ProviderData.getProviderName("sdf");
!       try {
!           
  
!           sql = "SELECT provider_no FROM property WHERE name = '" + strColName + "'";
!           ResultSet rs = DBHandler.GetSQL(sql);
!            
!           while (rs.next()) {
!               providerList.add(rs.getString("provider_no"));
!           }
!    
!       } catch (SQLException sqe) {
!           MiscUtils.getLogger().error("Error", sqe);        
!       }
!       
!       return providerList;
!     }
  }
--- 36,151 ----
  
  /**
!  * Manages MyOscar Login Id for provider
   */
! public final class ProviderMyOscarIdData {
  
! 	private static final Logger logger = MiscUtils.getLogger();
! 
! 	private static String strColName = "MyOscarId";
! 
! 	private ProviderMyOscarIdData() {
! 		// this is a utility class not an object, it shouldn't be instantiated.
! 	}
! 
! 	/**
! 	 *Retrieve myOscar login id for current provider first by querying property table
! 	 */
! 	public static String getMyOscarId(String providerNo) {
! 		String sql;
! 		String myOscarId = "";
! 		ResultSet rs;
! 
! 		try {
! 
! 			sql = "SELECT value FROM property WHERE name = '" + strColName + "' AND provider_no = '" + providerNo + "'";
! 			rs = DBHandler.GetSQL(sql);
! 
! 			if (rs.next()) {
! 				myOscarId = oscar.Misc.getString(rs, "value");
! 			}
! 
! 		} catch (SQLException ex) {
! 			logger.error("Error", ex);
! 		}
! 
! 		return myOscarId;
! 	}
! 
! 	/**
! 	 *set myOscar login id in property table
! 	 */
! 	public static boolean setId(String providerId, String id) {
! 		String sql;
! 		boolean ret = true;
! 
! 		try {
! 
! 			if (idIsSet(providerId)) sql = "UPDATE property SET value = '" + id + "' WHERE name = '" + strColName + "' AND provider_no = '" + providerId + "'";
! 			else sql = "INSERT INTO property (name,value,provider_no) VALUES('" + strColName + "', '" + id + "', '" + providerId + "')";
! 
! 			DBHandler.RunSQL(sql);
! 
! 		} catch (SQLException ex) {
! 			logger.error("Error adding provider myOscar Login Id: " + ex.getMessage());
! 			ret = false;
! 		}
! 
! 		return ret;
! 	}
! 
! 	public static boolean idIsSet(String providerId) throws SQLException {
! 		String sql;
! 		ResultSet rs;
! 
! 		sql = "SELECT value FROM property WHERE name = '" + strColName + "' AND provider_no = '" + providerId + "'";
! 
! 		rs = DBHandler.GetSQL(sql);
! 
! 		return rs.next();
! 
! 	}
! 
! 	// get provider number knowing the indivo id
! 	public static String getProviderNo(String myOscarId) {
! 		String sql = "";
! 		String providerNo = "";
! 		ResultSet rs = null;
! 
! 		try {
! 
! 			sql = "SELECT provider_no FROM property WHERE name = '" + strColName + "' AND value = '" + myOscarId + "'";
! 			MiscUtils.getLogger().debug(sql);
! 			rs = DBHandler.GetSQL(sql);
! 
! 			if (rs.next()) {
! 				providerNo = oscar.Misc.getString(rs, "provider_no");
! 			}
! 		} catch (SQLException ex) {
! 			logger.error("Error", ex);
! 		}
! 		return providerNo;
! 	}
! 
! 	public static List<String> listMyOscarProviderNums() {
! 		String sql;
! 		ArrayList<String> providerIdList = new ArrayList<String>();
! 		
! 		// hrmmm this line looks particularly odd, I wonder why he added this here...
! 		oscar.oscarProvider.data.ProviderData.getProviderName("sdf");
! 		
! 		try {
! 
! 			sql = "SELECT provider_no FROM property WHERE name = '" + strColName + "'";
! 			ResultSet rs = DBHandler.GetSQL(sql);
! 
! 			while (rs.next()) {
! 				providerIdList.add(rs.getString("provider_no"));
! 			}
! 
! 		} catch (SQLException sqe) {
! 			logger.error("Error", sqe);
! 		}
! 
! 		return providerIdList;
! 	}
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil ProEditMyOscarIdAction.java, 1.3, 1.4

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17959/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil

Modified Files:
	ProEditMyOscarIdAction.java 
Log Message:
bug fix for passing around providerId

Index: ProEditMyOscarIdAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil/ProEditMyOscarIdAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProEditMyOscarIdAction.java	11 Aug 2010 03:27:11 -0000	1.3
--- ProEditMyOscarIdAction.java	8 Dec 2010 22:59:11 -0000	1.4
***************
*** 40,43 ****
--- 40,44 ----
  public class ProEditMyOscarIdAction extends Action {
  
+     @Override
      public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws Exception
***************
*** 51,56 ****
          String loginId = (String)frm.get("myOscarLoginId") + (String)frm.get("myOscarDomain");       
                  
-         ProviderMyOscarIdData myOscarId = new ProviderMyOscarIdData();
-         
          if( ProviderMyOscarIdData.getMyOscarId(providerNo).equals(loginId) ) {
              ActionMessages errors = new ActionMessages();
--- 52,55 ----
***************
*** 60,64 ****
              
          }
!         else if( myOscarId.setId(loginId)) {
              request.setAttribute("status",new String("complete"));
              forward = new String("success");
--- 59,63 ----
              
          }
!         else if( ProviderMyOscarIdData.setId(providerNo,loginId)) {
              request.setAttribute("status",new String("complete"));
              forward = new String("success");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/phr/model PHRMessage.java, 1.11, 1.12

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/phr/model
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17959/web/WEB-INF/classes/src/org/oscarehr/phr/model

Modified Files:
	PHRMessage.java 
Log Message:
bug fix for passing around providerId

Index: PHRMessage.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/phr/model/PHRMessage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PHRMessage.java	15 Nov 2010 01:27:36 -0000	1.11
--- PHRMessage.java	8 Dec 2010 22:59:11 -0000	1.12
***************
*** 344,353 ****
      
      public Hashtable findOscarId(int idType, String phrId) {
-        ProviderMyOscarIdData providerData = new ProviderMyOscarIdData();
         DemographicData demographicData = new DemographicData();
         Hashtable results = new Hashtable();
         String oscarId = "";
         if (idType == PHRDocument.TYPE_PROVIDER) {
!            oscarId = providerData.getProviderNo(phrId);
             log.debug("OSCAR ID "+oscarId);
         } else if(idType == PHRDocument.TYPE_DEMOGRAPHIC) {
--- 344,352 ----
      
      public Hashtable findOscarId(int idType, String phrId) {
         DemographicData demographicData = new DemographicData();
         Hashtable results = new Hashtable();
         String oscarId = "";
         if (idType == PHRDocument.TYPE_PROVIDER) {
!            oscarId = ProviderMyOscarIdData.getProviderNo(phrId);
             log.debug("OSCAR ID "+oscarId);
         } else if(idType == PHRDocument.TYPE_DEMOGRAPHIC) {
***************
*** 355,359 ****
         } else if (idType == PHRDocument.TYPE_NOT_SET) {
             //try provider:
!            String searchNo = providerData.getProviderNo(phrId);
             if (!searchNo.equals("")) {
                 oscarId = searchNo;
--- 354,358 ----
         } else if (idType == PHRDocument.TYPE_NOT_SET) {
             //try provider:
!            String searchNo = ProviderMyOscarIdData.getProviderNo(phrId);
             if (!searchNo.equals("")) {
                 oscarId = searchNo;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util ResponseDefaultsFilter.java, 1.2, 1.3

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17959/web/WEB-INF/classes/src/org/oscarehr/util

Modified Files:
	ResponseDefaultsFilter.java 
Log Message:
bug fix for passing around providerId

Index: ResponseDefaultsFilter.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/ResponseDefaultsFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResponseDefaultsFilter.java	24 Nov 2010 03:50:18 -0000	1.2
--- ResponseDefaultsFilter.java	8 Dec 2010 22:59:11 -0000	1.3
***************
*** 19,22 ****
--- 19,23 ----
  	private static final Logger logger = MiscUtils.getLogger();
  	private static final String ENCODING="UTF-8";
+ 
  	
  	@Override

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/util indivoCheck.java, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17959/web/WEB-INF/classes/src/oscar/util

Modified Files:
	indivoCheck.java 
Log Message:
bug fix for passing around providerId

Index: indivoCheck.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/indivoCheck.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** indivoCheck.java	12 Jul 2010 20:04:12 -0000	1.5
--- indivoCheck.java	8 Dec 2010 22:59:11 -0000	1.6
***************
*** 67,73 ****
         
          try {            
!             ProviderMyOscarIdData prov = new ProviderMyOscarIdData(providerNo);
!                         
!             if( prov.idIsSet() ) {
                  if( demoNo != null ) {
                     DemographicData.Demographic demo = new DemographicData().getDemographic(demoNo); 
--- 67,71 ----
         
          try {            
!             if( ProviderMyOscarIdData.idIsSet(providerNo) ) {
                  if( demoNo != null ) {
                     DemographicData.Demographic demo = new DemographicData().getDemographic(demoNo); 

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers MDSHandler.java, 1.16, 1.17 MdsParser.java, 1.4, NONE

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23372/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers

Modified Files:
	MDSHandler.java 
Removed Files:
	MdsParser.java 
Log Message:
dodgy fix for MDS parsing compatibility problem due to no source for previous modified hapi version.

--- MdsParser.java DELETED ---

Index: MDSHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/MDSHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MDSHandler.java	11 Nov 2010 01:35:16 -0000	1.16
--- MDSHandler.java	8 Dec 2010 04:42:33 -0000	1.17
***************
*** 17,30 ****
  import java.util.HashMap;
  
  import org.apache.log4j.Logger;
  import org.oscarehr.util.MiscUtils;
  
  import oscar.util.UtilDateUtilities;
  import ca.uhn.hl7v2.HL7Exception;
- import ca.uhn.hl7v2.model.Message;
- import ca.uhn.hl7v2.model.Segment;
- import ca.uhn.hl7v2.model.Structure;
- import ca.uhn.hl7v2.util.Terser;
- import ca.uhn.hl7v2.validation.impl.NoValidation;
  
  /**
--- 17,27 ----
  import java.util.HashMap;
  
+ import org.apache.commons.lang.StringUtils;
  import org.apache.log4j.Logger;
+ import org.oscarehr.common.hl7.v2.oscar_to_oscar.DynamicHapiLoaderUtils;
  import org.oscarehr.util.MiscUtils;
  
  import oscar.util.UtilDateUtilities;
  import ca.uhn.hl7v2.HL7Exception;
  
  /**
***************
*** 34,39 ****
  public class MDSHandler implements MessageHandler {
      
!     Message msg = null;
!     Terser terser;
      ArrayList obrGroups = null;
      HashMap headerMaps = new HashMap();
--- 31,36 ----
  public class MDSHandler implements MessageHandler {
      
!     Object msg = null;
!     Object terser;
      ArrayList obrGroups = null;
      HashMap headerMaps = new HashMap();
***************
*** 45,106 ****
      
      public void init(String hl7Body) throws HL7Exception {
!         
!         MdsParser p = new MdsParser();
!         p.setValidationContext(new NoValidation());
!         msg = p.parse(hl7Body.replace( "\n", "\r\n"));
!         
!         terser = new Terser(msg);
!         
!         int obrCount = getOBRCount();
!         int obrNum;
!         boolean obrFlag;
!         String segmentName;
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         obrGroups = new ArrayList();
!         /*
!          *  Fill the OBX array list for use by future methods
!          */
!         for (int i=0; i < obrCount; i++){
!             ArrayList obxSegs = new ArrayList();
!             int count = 0;
!             
!             if (i == 0){
!                 try{
!                     while(terser.get("/.OBX("+count+")-1-1") != null){
!                         obxSegs.add("/.OBX("+count+")");
!                         count++;
!                     }
!                 }catch(Exception e){
!                     //ignore exception
!                 }
!             }
!             
!             obrNum = i+1;
!             obrFlag = false;
!             for (int k=0; k < segments.length; k++){
!                 
!                 segmentName = segments[k].substring(0, 3);
!                 
!                 if (obrFlag && segmentName.equals("OBX")){
!                     if (!segments[k].equals("OBX")) // would have already been added to first array
!                         obxSegs.add("/."+segments[k]);
!                 }else if (obrFlag && segmentName.equals("OBR")){
!                     break;
!                 }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){
!                     obrFlag = true;
!                 }
!                 
!             }
!             obrGroups.add(obxSegs);
!         }
!         /*
!         for(int i=0; i<obrGroups.size(); i++){
!             ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!             for (int j=0; j < obxSegs.size(); j++){
!                 String obx = (String) obxSegs.get(j);
!                 //logger.info("OBRSEG("+i+") OBXSEG("+j+"): "+obx);
!             }
          }
-          */
      }
      
--- 42,111 ----
      
      public void init(String hl7Body) throws HL7Exception {
!     	hl7Body=StringUtils.trimToNull(hl7Body);
!     	if (hl7Body==null)
!     	{
!     		logger.error("Some one called MDSHandler.init with null data");
!     		return;
!     	}
!     	
!     	
!     	try {
! 	        msg=DynamicHapiLoaderUtils.parseMdsMsg(hl7Body.replace( "\n", "\r\n"));
! 	        terser = DynamicHapiLoaderUtils.getMdsTerser(msg);
! 	        
! 	        int obrCount = getOBRCount();
! 	        int obrNum;
! 	        boolean obrFlag;
! 	        String segmentName;
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        obrGroups = new ArrayList();
! 	        /*
! 	         *  Fill the OBX array list for use by future methods
! 	         */
! 	        for (int i=0; i < obrCount; i++){
! 	            ArrayList obxSegs = new ArrayList();
! 	            int count = 0;
! 	            
! 	            if (i == 0){
! 	                try{
! 	                    while(DynamicHapiLoaderUtils.terserGet(terser, "/.OBX("+count+")-1-1") != null){
! 	                        obxSegs.add("/.OBX("+count+")");
! 	                        count++;
! 	                    }
! 	                }catch(Exception e){
! 	                    //ignore exception
! 	                }
! 	            }
! 	            
! 	            obrNum = i+1;
! 	            obrFlag = false;
! 	            for (int k=0; k < segments.length; k++){
! 	                
! 	                segmentName = segments[k].substring(0, 3);
! 	                
! 	                if (obrFlag && segmentName.equals("OBX")){
! 	                    if (!segments[k].equals("OBX")) // would have already been added to first array
! 	                        obxSegs.add("/."+segments[k]);
! 	                }else if (obrFlag && segmentName.equals("OBR")){
! 	                    break;
! 	                }else if ( segments[k].equals("OBR"+obrNum) || ( obrNum==1 && segments[k].equals("OBR"))){
! 	                    obrFlag = true;
! 	                }
! 	                
! 	            }
! 	            obrGroups.add(obxSegs);
! 	        }
! 	        /*
! 	        for(int i=0; i<obrGroups.size(); i++){
! 	            ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	            for (int j=0; j < obxSegs.size(); j++){
! 	                String obx = (String) obxSegs.get(j);
! 	                //logger.info("OBRSEG("+i+") OBXSEG("+j+"): "+obx);
! 	            }
! 	        }
! 	         */
!         } catch (Exception e) {
!         	logger.error("Unexpected error", e);
          }
      }
      
***************
*** 114,121 ****
          String priority = "R";
          try{
!             priority = terser.get("/.OBR-27-1");
              while(priority != null){
                  i++;
!                 priority = terser.get("/.OBR"+i+"-27-1");
                  if (!priority.equalsIgnoreCase("R")){
                      break;
--- 119,126 ----
          String priority = "R";
          try{
!             priority = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-27-1");
              while(priority != null){
                  i++;
!                 priority = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-27-1");
                  if (!priority.equalsIgnoreCase("R")){
                      break;
***************
*** 142,149 ****
              String test;
              try{
!                 test = terser.get("/.OBR-2-1");
                  while(test != null){
                      i++;
!                     test = terser.get("/.OBR"+i+"-2-1");
                  }
              }catch(Exception e){
--- 147,154 ----
              String test;
              try{
!                 test = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-2-1");
                  while(test != null){
                      i++;
!                     test = DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-2-1");
                  }
              }catch(Exception e){
***************
*** 178,184 ****
          try{
              if (i == 1){
!                 timeStamp = formatDateTime(getString(terser.get("/.OBR-7-1")));
              }else{
!                 timeStamp = formatDateTime(getString(terser.get("/.OBR"+i+"-7-1")));
              }
              return(timeStamp);
--- 183,189 ----
          try{
              if (i == 1){
!                 timeStamp = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser, "/.OBR-7-1")));
              }else{
!                 timeStamp = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser, "/.OBR"+i+"-7-1")));
              }
              return(timeStamp);
***************
*** 265,269 ****
          int count = 0;
          try {
!             String accessionNum = getString(terser.get("/.MSH-10-1"));
              count = Integer.parseInt(accessionNum.substring(accessionNum.lastIndexOf("-")+1));
          } catch (Exception e) {
--- 270,274 ----
          int count = 0;
          try {
!             String accessionNum = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.MSH-10-1"));
              count = Integer.parseInt(accessionNum.substring(accessionNum.lastIndexOf("-")+1));
          } catch (Exception e) {
***************
*** 286,291 ****
          try{
              
!             nextHeaderNum = terser.get("/.ZRG(0)-2-1");
!             nextHeader = getString(terser.get("/.ZRG(0)-7-1"));
              headerNum = nextHeaderNum;
              while(nextHeaderNum != null){
--- 291,296 ----
          try{
              
!             nextHeaderNum = DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG(0)-2-1");
!             nextHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG(0)-7-1"));
              headerNum = nextHeaderNum;
              while(nextHeaderNum != null){
***************
*** 299,303 ****
                      
                      if (currentHeader.equals(""))
!                         currentHeader = getString(terser.get("/.ZRG("+(i-1)+")-5-1"));
                      
                      headerMaps.put(headerNum, currentHeader);
--- 304,308 ----
                      
                      if (currentHeader.equals(""))
!                         currentHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+(i-1)+")-5-1"));
                      
                      headerMaps.put(headerNum, currentHeader);
***************
*** 308,317 ****
                  
                  i++;
!                 nextHeaderNum = terser.get("/.ZRG("+i+")-2-1");
!                 nextHeader = getString(terser.get("/.ZRG("+i+")-7-1"));
                  
              }
              if (currentHeader.equals(""))
!                 currentHeader = getString(terser.get("/.ZRG("+(i-1)+")-5-1"));
              
              headerMaps.put(headerNum, currentHeader);
--- 313,322 ----
                  
                  i++;
!                 nextHeaderNum = DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+i+")-2-1");
!                 nextHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+i+")-7-1"));
                  
              }
              if (currentHeader.equals(""))
!                 currentHeader = getString(DynamicHapiLoaderUtils.terserGet(terser, "/.ZRG("+(i-1)+")-5-1"));
              
              headerMaps.put(headerNum, currentHeader);
***************
*** 342,433 ****
       */
      public int getOBXCommentCount(int i, int j){
!         // jth obx of the ith obr
!         
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!         String obxSeg = ((String) obxSegs.get(j)).substring(2);
!         
!         // if the obxSeg is part of the first obx array
!         if (obxSeg.charAt(3) == '('){
!             
!             if(j+1 == obxSegs.size()){
!                 obxSeg = obxSeg.substring(0, 3);
!             }else{
!                 String nextObxSeg = ((String) obxSegs.get(j+1)).substring(2);
!                 if (nextObxSeg.charAt(3) == '('){
!                     return(0);
!                 }else{
!                     obxSeg = obxSeg.substring(0, 3);
!                 }
!             }
!             
!         }
!         
!         int k = 0;
!         while(!obxSeg.equals(segments[k])){
!             k++;
!         }
!         
!         int count = 0;
!         k++;
!         while (k < segments.length && segments[k].substring(0, 3).equals("NTE")){
!             k++;
!             count++;
          }
-         
-         return(count);
      }
      
      public String getOBXComment(int i, int j, int k){
          
!         String[] segments = terser.getFinder().getCurrentGroup().getNames();
!         ArrayList obxSegs = (ArrayList) obrGroups.get(i);
!         String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 
!         // if the obxSeg is part of the first obx array
!         if (obxSeg.charAt(3) == '('){
!             obxSeg = obxSeg.substring(0, 3);
!         }
!         
!         int l = 0;
!         while(!obxSeg.equals(segments[l])){
!             l++;
!         }
!         
!         l = l+k+1; // at this point, l is pointing at the NTE segment
!         
!         try{
!             Structure[] nteSegs = terser.getFinder().getRoot().getAll(segments[l]);
!             if (getString(terser.get("/."+segments[l]+"-2-1")).equals("MC")){
!               String comment = "";
!               for (int x=0; x < nteSegs.length; x++){
!                 
!                 int m = 0;
!                 int count = 0;
!                 Segment nteSeg = (Segment) nteSegs[x];
!                 String commentCode = getString(terser.get(nteSeg,3,0,2,1));
!                 String matchCommentCode = terser.get("/.ZMC("+m+")-2-1");
!                 while(matchCommentCode != null){
!                     
!                     if (matchCommentCode.equals(commentCode)){
!                         if (comment.equals(""))
!                             comment = getString(terser.get("/.ZMC("+m+")-6-1"));
!                         else
!                             comment = comment+"<br />"+getString(terser.get("/.ZMC("+m+")-6-1"));
!                     }
!                     
!                     m++;
!                     matchCommentCode = terser.get("/.ZMC("+m+")-2-1");
!                 }
!               }
!               return(comment);
!                 
!             }else{
!                 return(getString(terser.get("/."+segments[l]+"-3-2")));
!             }
!         }catch(Exception e){
!             logger.error("Could not retrieve OBX comments", e);
!             
!             return("");
          }
      }
--- 347,448 ----
       */
      public int getOBXCommentCount(int i, int j){
!         try {
! 	        // jth obx of the ith obr
! 	        
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	        String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 	        
! 	        // if the obxSeg is part of the first obx array
! 	        if (obxSeg.charAt(3) == '('){
! 	            
! 	            if(j+1 == obxSegs.size()){
! 	                obxSeg = obxSeg.substring(0, 3);
! 	            }else{
! 	                String nextObxSeg = ((String) obxSegs.get(j+1)).substring(2);
! 	                if (nextObxSeg.charAt(3) == '('){
! 	                    return(0);
! 	                }else{
! 	                    obxSeg = obxSeg.substring(0, 3);
! 	                }
! 	            }
! 	            
! 	        }
! 	        
! 	        int k = 0;
! 	        while(!obxSeg.equals(segments[k])){
! 	            k++;
! 	        }
! 	        
! 	        int count = 0;
! 	        k++;
! 	        while (k < segments.length && segments[k].substring(0, 3).equals("NTE")){
! 	            k++;
! 	            count++;
! 	        }
! 	        
! 	        return(count);
!         } catch (Exception e) {
! 	        logger.error("Unexpected error", e);
! 	        return(-1);
          }
      }
      
      public String getOBXComment(int i, int j, int k){
          
!     	try
!     	{
! 	        String[] segments = DynamicHapiLoaderUtils.terser_getFinder_getCurrentGroup_getNames(terser);
! 	        ArrayList obxSegs = (ArrayList) obrGroups.get(i);
! 	        String obxSeg = ((String) obxSegs.get(j)).substring(2);
! 	
! 	        // if the obxSeg is part of the first obx array
! 	        if (obxSeg.charAt(3) == '('){
! 	            obxSeg = obxSeg.substring(0, 3);
! 	        }
! 	        
! 	        int l = 0;
! 	        while(!obxSeg.equals(segments[l])){
! 	            l++;
! 	        }
! 	        
! 	        l = l+k+1; // at this point, l is pointing at the NTE segment
! 	        
! 	        try{
! 	            Object[] nteSegs = DynamicHapiLoaderUtils.terser_getFinder_getRoot_getAll(terser,segments[l]);
! 	            if (getString(DynamicHapiLoaderUtils.terserGet(terser,"/."+segments[l]+"-2-1")).equals("MC")){
! 	              String comment = "";
! 	              for (int x=0; x < nteSegs.length; x++){
! 	                
! 	                int m = 0;
! 	                Object nteSeg = nteSegs[x];
! 	                String commentCode = getString(DynamicHapiLoaderUtils.terserGet(terser,nteSeg,3,0,2,1));
! 	                String matchCommentCode = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-2-1");
! 	                while(matchCommentCode != null){
! 	                    
! 	                    if (matchCommentCode.equals(commentCode)){
! 	                        if (comment.equals(""))
! 	                            comment = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-6-1"));
! 	                        else
! 	                            comment = comment+"<br />"+getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-6-1"));
! 	                    }
! 	                    
! 	                    m++;
! 	                    matchCommentCode = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMC("+m+")-2-1");
! 	                }
! 	              }
! 	              return(comment);
! 	                
! 	            }else{
! 	                return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/."+segments[l]+"-3-2")));
! 	            }
! 	        }catch(Exception e){
! 	            logger.error("Could not retrieve OBX comments", e);
! 	            
! 	            return("");
! 	        }
!     	} catch (Exception e) {
! 	        logger.error("Unexpected error", e);
! 	        return(null);
          }
      }
***************
*** 443,448 ****
      public String getFirstName(){
          try {
!             return(getString(terser.get("/.PID-5-2")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 458,463 ----
      public String getFirstName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-2")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 451,456 ****
      public String getLastName(){
          try {
!             return(getString(terser.get("/.PID-5-1")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 466,471 ----
      public String getLastName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-1")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 459,464 ****
      public String getMiddleName(){
          try {
!             return(getString(terser.get("/.PID-5-3")));
!         } catch (HL7Exception ex) {
              return("");
          }
--- 474,479 ----
      public String getMiddleName(){
          try {
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-5-3")));
!         } catch (Exception ex) {
              return("");
          }
***************
*** 471,475 ****
      public String getDOB(){
          try{
!             return(formatDateTime(getString(terser.get("/.PID-7-1"))).substring(0, 10));
          }catch(Exception e){
              logger.error("Error retrieving date of birth", e);
--- 486,490 ----
      public String getDOB(){
          try{
!             return(formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-7-1"))).substring(0, 10));
          }catch(Exception e){
              logger.error("Error retrieving date of birth", e);
***************
*** 495,499 ****
      public String getSex(){
          try{
!             return(getString(terser.get("/.PID-8-1")));
          }catch(Exception e){
              return("");
--- 510,514 ----
      public String getSex(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-8-1")));
          }catch(Exception e){
              return("");
***************
*** 503,507 ****
      public String getHealthNum(){
          try{
!             String healthNum = getString(terser.get("/.PID-19-1"));
              int end = healthNum.indexOf(" ");
              if (end > 0)
--- 518,522 ----
      public String getHealthNum(){
          try{
!             String healthNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-19-1"));
              int end = healthNum.indexOf(" ");
              if (end > 0)
***************
*** 516,520 ****
      public String getHealthNumVersion(){
          try{
!             String healthNum = getString(terser.get("/.PID-19-1"));
              return(healthNum.substring(healthNum.indexOf(" ")+1));
          }catch(Exception e){
--- 531,535 ----
      public String getHealthNumVersion(){
          try{
!             String healthNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-19-1"));
              return(healthNum.substring(healthNum.indexOf(" ")+1));
          }catch(Exception e){
***************
*** 525,529 ****
      public String getHomePhone(){
          try{
!             return(getString(terser.get("/.PID-13-1")));
          }catch(Exception e){
              return("");
--- 540,544 ----
      public String getHomePhone(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.PID-13-1")));
          }catch(Exception e){
              return("");
***************
*** 537,541 ****
      public String getPatientLocation(){
          try{
!             return(getString(terser.get("/.MSH-3-1")));
              //return(getString(terser.get("/.PV1-3-1-1")));
          }catch(Exception e){
--- 552,556 ----
      public String getPatientLocation(){
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-3-1")));
              //return(getString(terser.get("/.PV1-3-1-1")));
          }catch(Exception e){
***************
*** 558,562 ****
          String ret = "F";
          try{
!             if (getString(terser.get("/.ZFR-3-1")).equals("0"))
                  return("P");
              
--- 573,577 ----
          String ret = "F";
          try{
!             if (getString(DynamicHapiLoaderUtils.terserGet(terser,"/.ZFR-3-1")).equals("0"))
                  return("P");
              
***************
*** 566,570 ****
              // If one of the zfr segments says partial, the lab should be marked
              // as a partial lab
!             while ((status = terser.get("/.ZFR("+i+")-3-1")) != null){
                  if (status.equals("0")){
                      ret = "P";
--- 581,585 ----
              // If one of the zfr segments says partial, the lab should be marked
              // as a partial lab
!             while ((status = DynamicHapiLoaderUtils.terserGet(terser,"/.ZFR("+i+")-3-1")) != null){
                  if (status.equals("0")){
                      ret = "P";
***************
*** 581,585 ****
      public String getClientRef(){
          try{
!             String clientNum = getString(terser.get("/.MSH-10-1"));
              int firstDash = clientNum.indexOf("-");
              return(clientNum.substring(0, firstDash));
--- 596,600 ----
      public String getClientRef(){
          try{
!             String clientNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              int firstDash = clientNum.indexOf("-");
              return(clientNum.substring(0, firstDash));
***************
*** 591,595 ****
      public String getDocNum(){
          try{
!             return(terser.get("/.PV1-8-1").replace("-", ""));
          }catch(Exception e){
              return("");
--- 606,610 ----
      public String getDocNum(){
          try{
!             return(DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-8-1").replace("-", ""));
          }catch(Exception e){
              return("");
***************
*** 599,603 ****
      public String getAccessionNum(){
          try{
!             String accessionNum = getString(terser.get("/.MSH-10-1"));
              int firstDash = accessionNum.indexOf("-");
              int secondDash = accessionNum.indexOf("-", firstDash+1);
--- 614,618 ----
      public String getAccessionNum(){
          try{
!             String accessionNum = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              int firstDash = accessionNum.indexOf("-");
              int secondDash = accessionNum.indexOf("-", firstDash+1);
***************
*** 634,644 ****
          String docNum;
          try{
!             if ((docNum = terser.get("/.PV1-8-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = terser.get("/.PV1-9-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = terser.get("/.PV1-17-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
--- 649,659 ----
          String docNum;
          try{
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-8-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-9-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
!             if ((docNum = DynamicHapiLoaderUtils.terserGet(terser,"/.PV1-17-1")) != null){
                  nums.add(docNum.replace("-", ""));
              }
***************
*** 656,660 ****
          
          try{
!             String typeField = getString(terser.get("/.MSH-10-1"));
              char typeNum = typeField.charAt(typeField.indexOf('-', typeField.indexOf('-')+1)+1);
              
--- 671,675 ----
          
          try{
!             String typeField = getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-10-1"));
              char typeNum = typeField.charAt(typeField.indexOf('-', typeField.indexOf('-')+1)+1);
              
***************
*** 679,683 ****
          
          try{
!             String dateString = formatDateTime(getString(terser.get("/.MSH-7-1")));
              return(dateString);
          }catch(Exception e){
--- 694,698 ----
          
          try{
!             String dateString = formatDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-7-1")));
              return(dateString);
          }catch(Exception e){
***************
*** 690,694 ****
          Date date = null;
          try{
!             date = getDateTime(getString(terser.get("/.MSH-7-1"))); 
          }catch(Exception e){
              //Not sure what to do here
--- 705,709 ----
          Date date = null;
          try{
!             date = getDateTime(getString(DynamicHapiLoaderUtils.terserGet(terser,"/.MSH-7-1"))); 
          }catch(Exception e){
              //Not sure what to do here
***************
*** 703,707 ****
          
          try{
!             return(getString(terser.get(obxSeg+"-"+field)));
          }catch(Exception e){
              return("");
--- 718,722 ----
          
          try{
!             return(getString(DynamicHapiLoaderUtils.terserGet(terser,obxSeg+"-"+field)));
          }catch(Exception e){
              return("");
***************
*** 715,721 ****
          String headerNum = "null";
          try{
!             String zmnNum = terser.get("/.ZMN(0)-8-1");
              
!             String obxNum = terser.get(obxSeg+"-4-1");
              // we only need the last section of the headerNum
              obxNum = obxNum.substring(obxNum.indexOf("-", obxNum.indexOf("-")+1)+1);
--- 730,736 ----
          String headerNum = "null";
          try{
!             String zmnNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN(0)-8-1");
              
!             String obxNum = DynamicHapiLoaderUtils.terserGet(terser,obxSeg+"-4-1");
              // we only need the last section of the headerNum
              obxNum = obxNum.substring(obxNum.indexOf("-", obxNum.indexOf("-")+1)+1);
***************
*** 723,731 ****
              while(zmnNum != null){
                  if (zmnNum.equals(obxNum)){
!                     headerNum = terser.get("/.ZMN("+i+")-10-1");
                      break;
                  }
                  i++;
!                 zmnNum = terser.get("/.ZMN("+i+")-8-1");
              }
              
--- 738,746 ----
              while(zmnNum != null){
                  if (zmnNum.equals(obxNum)){
!                     headerNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN("+i+")-10-1");
                      break;
                  }
                  i++;
!                 zmnNum = DynamicHapiLoaderUtils.terserGet(terser,"/.ZMN("+i+")-8-1");
              }
              
***************
*** 745,761 ****
          String temp;
          
!         // get name prefix ie/ DR.
!         temp = terser.get(docSeg+"6");
!         if(temp != null)
!             docName = temp;
!         
!         // get the name
!         temp = terser.get(docSeg+"2");
!         if(temp != null){
!             if (docName.equals("")){
!                 docName = temp;
!             }else{
!                 docName = docName +" "+ temp;
!             }
          }
          
--- 760,780 ----
          String temp;
          
!         try {
! 	        // get name prefix ie/ DR.
! 	        temp = DynamicHapiLoaderUtils.terserGet(terser,docSeg+"6");
! 	        if(temp != null)
! 	            docName = temp;
! 	        
! 	        // get the name
! 	        temp = DynamicHapiLoaderUtils.terserGet(terser,docSeg+"2");
! 	        if(temp != null){
! 	            if (docName.equals("")){
! 	                docName = temp;
! 	            }else{
! 	                docName = docName +" "+ temp;
! 	            }
! 	        }
!         } catch (Exception e) {
! 	        logger.error("Unexpected Error.", e);
          }
          

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork readme.txt, NONE, 1.1 hacked_patched_hapi-0.5.1.jar, NONE, 1.1 commons-logging-1.1.1.jar, NONE, 1.1

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23372/web/WEB-INF/classes/hapi_libs/fork

Added Files:
	readme.txt hacked_patched_hapi-0.5.1.jar 
	commons-logging-1.1.1.jar 
Log Message:
dodgy fix for MDS parsing compatibility problem due to no source for previous modified hapi version.

--- NEW FILE: commons-logging-1.1.1.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hacked_patched_hapi-0.5.1.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: readme.txt ---
The jar files are in here because they need to be files "in the class path" not like normal library files.

These jar files are dynamically loaded upon special cases and conflict with other jars in the system so they should be left here.

Specifically this is for MDS lab uploads. When some one fixes / rewrites the MDS Lab Uploads, these can then be deleted.

These jars are referenced from DynamicHapiLoaderUtils.java

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar DynamicHapiLoaderUtils.java, NONE, 1.1

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23372/web/WEB-INF/classes/src/org/oscarehr/common/hl7/v2/oscar_to_oscar

Added Files:
	DynamicHapiLoaderUtils.java 
Log Message:
dodgy fix for MDS parsing compatibility problem due to no source for previous modified hapi version.

--- NEW FILE: DynamicHapiLoaderUtils.java ---
package org.oscarehr.common.hl7.v2.oscar_to_oscar;

import java.io.File;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;

import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.oscarehr.util.MiscUtils;

public final class DynamicHapiLoaderUtils {

	private static final Logger logger = MiscUtils.getLogger();

	private static URLClassLoader hackedHapiClassLoader;
	private static Class<?> hackedPipedParserClass;
	private static Method hackedParseMethod;
	private static Object hackedPipedParserInstance;
	private static Class<?> hackedMessageClass;
	private static Class<?> hackedSegmentClass;
	private static Method hackedEncodeMethod;
	private static Class<?> hackedTerserClass;
	private static Constructor<?> hackedTerserConstructor;
	private static Class<?> hackedTerserUtilsClass;
	private static Method hackedTerserGetMethod;
	private static Method hackedTerserGetBySegmentMethod;
	private static Method hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod;
	private static Method hackedTerserUtilsterser_getFinder_getRoot_getAllMethod;

	static{
		try
		{
			initialise();
		}
		catch (Exception e)
		{
			logger.error("Unexpected error.", e);
		}
	}
	
	private static void initialise() throws ClassNotFoundException, SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
	{
		hackedHapiClassLoader=getHackedUrlClassLoader();

		hackedPipedParserClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.parser.PipeParser");		
		hackedMessageClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.model.Message");
		hackedSegmentClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.model.Segment");
		hackedTerserClass=hackedHapiClassLoader.loadClass("ca.uhn.hl7v2.util.Terser");
		hackedTerserUtilsClass=hackedHapiClassLoader.loadClass("TerserUtils");

		hackedParseMethod=hackedPipedParserClass.getMethod("parse", String.class);
		hackedEncodeMethod=hackedPipedParserClass.getMethod("encode", hackedMessageClass);
		
		hackedPipedParserInstance=hackedPipedParserClass.newInstance();
		setNoValidate(hackedHapiClassLoader,hackedPipedParserClass,hackedPipedParserInstance);
		
		hackedTerserConstructor=hackedTerserClass.getConstructor(hackedMessageClass);
		hackedTerserGetMethod=hackedTerserClass.getMethod("get", String.class);
		hackedTerserGetBySegmentMethod=hackedTerserClass.getMethod("get", hackedSegmentClass, int.class, int.class, int.class, int.class);

		hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod=hackedTerserUtilsClass.getMethod("terser_getFinder_getCurrentGroup_getNames", hackedTerserClass);
		hackedTerserUtilsterser_getFinder_getRoot_getAllMethod=hackedTerserUtilsClass.getMethod("terser_getFinder_getRoot_getAll", hackedTerserClass, String.class);
	}
	
	private static URLClassLoader getHackedUrlClassLoader()
	{
		// HACKED_HAPI_51_JAR = "/hapi_libs/fork/hapi_51_fork.jar";

		URL[] urls = new URL[2];
		urls[0] = DynamicHapiLoaderUtils.class.getResource("/hapi_libs/fork/hacked_patched_hapi-0.5.1.jar");
		urls[1] = DynamicHapiLoaderUtils.class.getResource("/hapi_libs/fork/commons-logging-1.1.1.jar");
		
		if (logger.isDebugEnabled()) {
			try {
				logger.debug("jar:hacked hapi, size: "+urls[0].openStream().available());
			} catch (IOException e) {
				logger.error("Unexpected Error", e);
			}
		}
		
		URLClassLoader classLoader = new URLClassLoader(urls, null);
		return(classLoader);
	}
	
	
	private static void setNoValidate(URLClassLoader classLoader, Class<?> pipedParserClass, Object pipedParserInstance) throws ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, NoSuchMethodException
	{
		Class<?> noValidateClass=classLoader.loadClass("ca.uhn.hl7v2.validation.impl.NoValidation");
		Object noValidateInstance=noValidateClass.newInstance();
		
		Class<?> validationContextClass=classLoader.loadClass("ca.uhn.hl7v2.validation.ValidationContext");
		
		Method noValidateMethod=pipedParserClass.getMethod("setValidationContext", validationContextClass);
		noValidateMethod.invoke(pipedParserInstance, new Object[]{noValidateInstance});
	}
	
	public static Object parseMdsMsg(String hl7Text) throws IllegalAccessException, SecurityException, IllegalArgumentException, InvocationTargetException {
		Object result=hackedParseMethod.invoke(hackedPipedParserInstance, hl7Text);
		return(result);
	}

	
	public static String encodeMdsMsg(Object mdsMessage) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedEncodeMethod.invoke(hackedPipedParserInstance, mdsMessage);
		return(result);
	}
	
	public static Object getMdsTerser(Object mdsMsg) throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException
	{
		Object terser=hackedTerserConstructor.newInstance(mdsMsg);
		return(terser);
	}
	
	public static String terserGet(Object terser, String s) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedTerserGetMethod.invoke(terser, s);
		return(result);
	}

	public static String terserGet(Object terser, Object segment, int a, int b, int c, int d) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String result=(String) hackedTerserGetBySegmentMethod.invoke(terser, segment, a, b, c, d);
		return(result);
	}

	public static String[] terser_getFinder_getCurrentGroup_getNames(Object terser) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		String[] result=(String[]) hackedTerserUtilsterser_getFinder_getCurrentGroup_getNamesMethod.invoke(null, terser);
		return(result);
	}

	public static Object[] terser_getFinder_getRoot_getAll(Object terser, String segment) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
	{
		Object[] result=(Object[]) hackedTerserUtilsterser_getFinder_getRoot_getAllMethod.invoke(null, terser, segment);
		return(result);		
	}
	
	public static void main(String... argv) throws Exception {
		String hl7msg = FileUtils.readFileToString(new File("/data/git/oscar_utils/tmp/51_hl7body.txt")).trim();

		Object msg = parseMdsMsg(hl7msg);
		String result=encodeMdsMsg(msg);
		
		logger.error("--------------------");
		logger.error(result.replace("\r", "\n"));

		Object terser=getMdsTerser(msg);
		logger.error("--------------------");		
	
	}
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork - New directory

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23312/web/WEB-INF/classes/hapi_libs/fork

Log Message:
Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs/fork added to the repository

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/hapi_libs - New directory

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23312/web/WEB-INF/classes/hapi_libs

Log Message:
Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/hapi_libs added to the repository

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit_bc.sql, 1.68.6.1, 1.68.6.2 oscarinit_on.sql, 1.24.4.1, 1.24.4.2

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32597

Modified Files:
      Tag: RELEASE_10_12
	oscarinit_bc.sql oscarinit_on.sql 
Log Message:
- ID: 3100826 Rourke table definition without default charset

Index: oscarinit_bc.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit_bc.sql,v
retrieving revision 1.68.6.1
retrieving revision 1.68.6.2
diff -C2 -d -r1.68.6.1 -r1.68.6.2
*** oscarinit_bc.sql	6 Dec 2010 14:44:57 -0000	1.68.6.1
--- oscarinit_bc.sql	6 Dec 2010 15:44:36 -0000	1.68.6.2
***************
*** 4696,4698 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 4696,4698 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

Index: oscarinit_on.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit_on.sql,v
retrieving revision 1.24.4.1
retrieving revision 1.24.4.2
diff -C2 -d -r1.24.4.1 -r1.24.4.2
*** oscarinit_on.sql	6 Dec 2010 14:44:57 -0000	1.24.4.1
--- oscarinit_on.sql	6 Dec 2010 15:44:36 -0000	1.24.4.2
***************
*** 2512,2514 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 2512,2514 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2010-12-01.sql, 1.1.2.1, 1.1.2.2

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32378

Modified Files:
      Tag: RELEASE_10_12
	update-2010-12-01.sql 
Log Message:
- ID: 3100826 Rourke table definition without default charset

Index: update-2010-12-01.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-12-01.sql,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** update-2010-12-01.sql	6 Dec 2010 14:45:42 -0000	1.1.2.1
--- update-2010-12-01.sql	6 Dec 2010 15:43:40 -0000	1.1.2.2
***************
*** 814,816 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 814,816 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit_on.sql, 1.25, 1.26 oscarinit_bc.sql, 1.69, 1.70

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32047

Modified Files:
	oscarinit_on.sql oscarinit_bc.sql 
Log Message:
- ID: 3100826 Rourke table definition without default charset

Index: oscarinit_bc.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit_bc.sql,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** oscarinit_bc.sql	6 Dec 2010 14:56:45 -0000	1.69
--- oscarinit_bc.sql	6 Dec 2010 15:42:02 -0000	1.70
***************
*** 4696,4698 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 4696,4698 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

Index: oscarinit_on.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit_on.sql,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** oscarinit_on.sql	6 Dec 2010 14:56:45 -0000	1.25
--- oscarinit_on.sql	6 Dec 2010 15:42:02 -0000	1.26
***************
*** 2512,2514 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 2512,2514 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2010-12-01.sql, 1.2, 1.3

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30972

Modified Files:
	update-2010-12-01.sql 
Log Message:
- ID: 3100826 Rourke table definition without default charset

Index: update-2010-12-01.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-12-01.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** update-2010-12-01.sql	6 Dec 2010 14:57:44 -0000	1.2
--- update-2010-12-01.sql	6 Dec 2010 15:38:55 -0000	1.3
***************
*** 814,816 ****
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--- 814,816 ----
    `p2_signature6m` varchar(250) ,
    PRIMARY KEY (`ID`)
! ) ENGINE=MyISAM;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscar_mcmaster.properties, 1.75.2.1, 1.75.2.2

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25578

Modified Files:
      Tag: RELEASE_10_12
	oscar_mcmaster.properties 
Log Message:
/var/lib/tomcat6/webapps/OscarDocument
is the default Ubuntu install location if you follow the installation instructions

Index: oscar_mcmaster.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -C2 -d -r1.75.2.1 -r1.75.2.2
*** oscar_mcmaster.properties	4 Dec 2010 19:04:20 -0000	1.75.2.1
--- oscar_mcmaster.properties	6 Dec 2010 04:26:59 -0000	1.75.2.2
***************
*** 98,108 ****
  #ie. DOCUMENT_DIR will be create as /var/lib/OscarDocument/<Context>/document
  #
! #BASE_DOCUMENT_DIR=/var/lib/OscarDocument/
  
  # Billing download folder
! #HOME_DIR = /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/billing/download/
  
  # Documents directory
! #DOCUMENT_DIR = /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/document/
  DOCUMENT_DOWNLOAD_METHOD = stream
  DOC_FORWARD: /dms/complete.jsp
--- 98,108 ----
  #ie. DOCUMENT_DIR will be create as /var/lib/OscarDocument/<Context>/document
  #
! #BASE_DOCUMENT_DIR =/var/lib/tomcat6/webapps/OscarDocument/
  
  # Billing download folder
! #HOME_DIR =/var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/billing/download/
  
  # Documents directory
! #DOCUMENT_DIR = /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/document/
  DOCUMENT_DOWNLOAD_METHOD = stream
  DOC_FORWARD: /dms/complete.jsp

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscar_mcmaster.properties, 1.77, 1.78

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24567

Modified Files:
	oscar_mcmaster.properties 
Log Message:
/var/lib/tomcat6/webapps/OscarDocument
is the default Ubuntu install location if you follow the installation instructions

Index: oscar_mcmaster.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** oscar_mcmaster.properties	4 Dec 2010 19:10:51 -0000	1.77
--- oscar_mcmaster.properties	6 Dec 2010 04:24:27 -0000	1.78
***************
*** 98,108 ****
  #ie. DOCUMENT_DIR will be create as /var/lib/OscarDocument/<Context>/document
  #
! #BASE_DOCUMENT_DIR=/var/lib/OscarDocument/
  
  # Billing download folder
! #HOME_DIR = /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/billing/download/
  
  # Documents directory
! #DOCUMENT_DIR = /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/document/
  DOCUMENT_DOWNLOAD_METHOD = stream
  DOC_FORWARD: /dms/complete.jsp
--- 98,108 ----
  #ie. DOCUMENT_DIR will be create as /var/lib/OscarDocument/<Context>/document
  #
! #BASE_DOCUMENT_DIR=/var/lib/tomcat6/webapps/OscarDocument/
  
  # Billing download folder
! #HOME_DIR = /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/billing/download/
  
  # Documents directory
! #DOCUMENT_DIR = /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/document/
  DOCUMENT_DOWNLOAD_METHOD = stream
  DOC_FORWARD: /dms/complete.jsp

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/util Utilities.java, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15990/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/util

Modified Files:
	Utilities.java 
Log Message:
added debug statement

Index: Utilities.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/util/Utilities.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Utilities.java	11 Nov 2010 01:35:11 -0000	1.5
--- Utilities.java	6 Dec 2010 03:53:49 -0000	1.6
***************
*** 21,24 ****
--- 21,25 ----
  import java.util.Date;
  
+ import org.apache.log4j.Logger;
  import org.oscarehr.util.MiscUtils;
  
***************
*** 27,30 ****
--- 28,33 ----
  public class Utilities {
         
+ 	private static final Logger logger=MiscUtils.getLogger();
+ 	
      private Utilities() {
      	// utils shouldn't be instantiated
***************
*** 102,105 ****
--- 105,109 ----
              retVal = place+"LabUpload."+filename.replaceAll(".enc", "")+"."+(new Date()).getTime();
              
+             logger.debug("saveFile place="+place+", retVal="+retVal);
              //write the  file to the file specified
              OutputStream os = new FileOutputStream(retVal);
***************
*** 114,122 ****
              stream.close();
          }catch (FileNotFoundException fnfe) {
!             MiscUtils.getLogger().error("Error", fnfe);
              return retVal;
              
          }catch (IOException ioe) {
!             MiscUtils.getLogger().error("Error", ioe);
              return retVal;
          }
--- 118,126 ----
              stream.close();
          }catch (FileNotFoundException fnfe) {
!         	logger.error("Error", fnfe);
              return retVal;
              
          }catch (IOException ioe) {
!         	logger.error("Error", ioe);
              return retVal;
          }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.359, 1.360

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11742

Modified Files:
	oscarResources_en.properties 
Log Message:
ID: 3128045   Broken tag fixed

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.359
retrieving revision 1.360
diff -C2 -d -r1.359 -r1.360
*** oscarResources_en.properties	5 Dec 2010 03:22:10 -0000	1.359
--- oscarResources_en.properties	5 Dec 2010 16:00:47 -0000	1.360
***************
*** 1055,1059 ****
  admin.provider.formHsoNo=Alternate Billing #
  admin.provider.formStatus=Status
! admin.provideradmin.resourcebaseurl.btnAdd=Ajouter un code de service.formSpecialtyCode=Specialty Code #
  admin.provider.formBillingGroupNo=Group Billing #
  admin.provider.formSlpUsername=Self Learning Username
--- 1055,1060 ----
  admin.provider.formHsoNo=Alternate Billing #
  admin.provider.formStatus=Status
! admin.provideradmin.resourcebaseurl.btnAdd=Add a service code.
! admin.provider.formSpecialtyCode=Specialty Code #
  admin.provider.formBillingGroupNo=Group Billing #
  admin.provider.formSlpUsername=Self Learning Username

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.357.2.2, 1.357.2.3

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10952

Modified Files:
      Tag: RELEASE_10_12
	oscarResources_en.properties 
Log Message:
ID: 3128045   Broken tag fixed

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.357.2.2
retrieving revision 1.357.2.3
diff -C2 -d -r1.357.2.2 -r1.357.2.3
*** oscarResources_en.properties	5 Dec 2010 03:20:34 -0000	1.357.2.2
--- oscarResources_en.properties	5 Dec 2010 15:58:21 -0000	1.357.2.3
***************
*** 1054,1058 ****
  admin.provider.formHsoNo=Alternate Billing #
  admin.provider.formStatus=Status
! admin.provideradmin.resourcebaseurl.btnAdd=Ajouter un code de service.formSpecialtyCode=Specialty Code #
  admin.provider.formBillingGroupNo=Group Billing #
  admin.provider.formSlpUsername=Self Learning Username
--- 1054,1059 ----
  admin.provider.formHsoNo=Alternate Billing #
  admin.provider.formStatus=Status
! admin.provideradmin.resourcebaseurl.btnAdd=Ajouter un code de service.
! admin.provider.formSpecialtyCode=Specialty Code #
  admin.provider.formBillingGroupNo=Group Billing #
  admin.provider.formSlpUsername=Self Learning Username

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.358, 1.359

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6593

Modified Files:
	oscarResources_en.properties 
Log Message:
Resources tag for the tab and the tooltip were reversed, better now

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.358
retrieving revision 1.359
diff -C2 -d -r1.358 -r1.359
*** oscarResources_en.properties	30 Nov 2010 08:17:56 -0000	1.358
--- oscarResources_en.properties	5 Dec 2010 03:22:10 -0000	1.359
***************
*** 660,664 ****
  global.report=<u>R</u>eport
  global.reportShortcut=82
! global.resources=R<u>e</u>sources
  global.resourcesShortcut=69
  global.rx=Rx
--- 660,664 ----
  global.report=<u>R</u>eport
  global.reportShortcut=82
! global.resources=Clinical Resources
  global.resourcesShortcut=69
  global.rx=Rx
***************
*** 698,702 ****
  oscarEncounter.Index.calculators=calculators
  oscarEncounter.Index.clinicalModules=Clinical Modules
! oscarEncounter.Index.clinicalResources=Clinical Resources
  oscarEncounter.Index.closeEncounterWindowConfirm=Are you sure you wish to exit oscarEncounter without saving?
  oscarEncounter.Index.confirmExit=Are you sure you wish to exit oscarEncounter without saving?
--- 698,702 ----
  oscarEncounter.Index.calculators=calculators
  oscarEncounter.Index.clinicalModules=Clinical Modules
! oscarEncounter.Index.clinicalResources=R<u>e</u>sources
  oscarEncounter.Index.closeEncounterWindowConfirm=Are you sure you wish to exit oscarEncounter without saving?
  oscarEncounter.Index.confirmExit=Are you sure you wish to exit oscarEncounter without saving?
***************
*** 2652,2656 ****
  oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet
  oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers
! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201cPick up your hat and shoes and put them in the closet.\u201d)
  oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words
  oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail
--- 2652,2656 ----
  oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet
  oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers
! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201CPick up your hat and shoes and put them in the closet.\u201D)
  oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words
  oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail
***************
*** 4583,4587 ****
  pager.header.title=Resultado:
  pager.max.page.index=10
! pager.next.desc=Pr\u00f3ximo
  pager.prev.desc=Anterior
  
--- 4583,4587 ----
  pager.header.title=Resultado:
  pager.max.page.index=10
! pager.next.desc=Pr\u00F3ximo
  pager.prev.desc=Anterior