oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMessenger/img clip3ol.jpg, NONE, 1.1 clip3.jpg, NONE, 1.1 clip4.jpg, NONE, 1.1 clip4.JPG, 1.1, NONE clip3.JPG, 1.1, NONE clip3ol.JPG, 1.1, NONE

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/img
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3443/web/oscarMessenger/img

Added Files:
	clip3ol.jpg clip3.jpg clip4.jpg 
Removed Files:
	clip4.JPG clip3.JPG clip3ol.JPG 
Log Message:
corrected case of JPG's 

--- NEW FILE: clip4.jpg ---
(This appears to be a binary file; contents omitted.)

--- clip4.JPG DELETED ---

--- clip3ol.JPG DELETED ---

--- NEW FILE: clip3ol.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: clip3.jpg ---
(This appears to be a binary file; contents omitted.)

--- clip3.JPG DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager manage_consent_text.jspf, 1.6, 1.7

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1134/web/PMmodule/ClientManager

Modified Files:
	manage_consent_text.jspf 
Log Message:
corrected image case

Index: manage_consent_text.jspf
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/manage_consent_text.jspf,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** manage_consent_text.jspf	9 Oct 2010 03:46:25 -0000	1.6
--- manage_consent_text.jspf	10 Nov 2010 10:49:55 -0000	1.7
***************
*** 1,5 ****
  <%String _appPath = request.getContextPath();
  %>
! <p><image src="<%=_appPath%>/images/CAISI_Large_Logo_4_grey_blue.PNG" border="0" align="center"></image></p>
  <p><font color="#2b6991" face="Helvetica Neue" size="4"><b>Individual 
  Consent form for personal information integration</b></font></h1>
--- 1,5 ----
  <%String _appPath = request.getContextPath();
  %>
! <p><image src="<%=_appPath%>/images/CAISI_Large_Logo_4_grey_blue.png" border="0" align="center"></image></p>
  <p><font color="#2b6991" face="Helvetica Neue" size="4"><b>Individual 
  Consent form for personal information integration</b></font></h1>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/images CAISI_Large_Logo_4_grey_blue.png, NONE, 1.1 CAISI_Large_Logo_4_grey_blue.PNG, 1.2, NONE

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/images
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1134/web/images

Added Files:
	CAISI_Large_Logo_4_grey_blue.png 
Removed Files:
	CAISI_Large_Logo_4_grey_blue.PNG 
Log Message:
corrected image case

--- NEW FILE: CAISI_Large_Logo_4_grey_blue.png ---
(This appears to be a binary file; contents omitted.)

--- CAISI_Large_Logo_4_grey_blue.PNG DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/util MD5.java, 1.4, NONE

[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-serv32022/web/WEB-INF/classes/src/oscar/util

Removed Files:
	MD5.java 
Log Message:
second pass at removing MD5 class

--- MD5.java DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/build jspc.xml, 1.18, 1.19 maven_jspc.xml, 1.1, 1.2

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

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

Modified Files:
	jspc.xml maven_jspc.xml 
Log Message:
since we got rid of jasper errors, we might as well fail on it now if new errors show up

Index: maven_jspc.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/maven_jspc.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** maven_jspc.xml	21 Oct 2010 23:17:29 -0000	1.1
--- maven_jspc.xml	10 Nov 2010 10:39:10 -0000	1.2
***************
*** 47,54 ****
  			<equals arg1="${tomcat.lib.dir}" arg2="${catalina.home}/lib" />
  			<then>
! 				<jasper uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspc.generatedDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="false" />
  			</then>
  			<else>
! 				<jasper2 uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspc.generatedDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="false" />
  			</else>
  		</if>
--- 47,54 ----
  			<equals arg1="${tomcat.lib.dir}" arg2="${catalina.home}/lib" />
  			<then>
! 				<jasper uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspc.generatedDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="true" />
  			</then>
  			<else>
! 				<jasper2 uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspc.generatedDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="true" />
  			</else>
  		</if>

Index: jspc.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/jspc.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** jspc.xml	21 Oct 2010 22:10:51 -0000	1.18
--- jspc.xml	10 Nov 2010 10:39:10 -0000	1.19
***************
*** 59,66 ****
  			<equals arg1="${tomcat.lib.dir}" arg2="${catalina.home}/lib" />
  			<then>
! 				<jasper uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspcDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="false" />
  			</then>
  			<else>
! 				<jasper2 uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspcDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="false" />
  			</else>
  		</if>
--- 59,66 ----
  			<equals arg1="${tomcat.lib.dir}" arg2="${catalina.home}/lib" />
  			<then>
! 				<jasper uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspcDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="true" />
  			</then>
  			<else>
! 				<jasper2 uriroot="${jspc.expandedWarDir}" webXmlFragment="${jspcDir}/generated_web.xml" outputDir="${jspc.generatedDir}" validateXml="false" failOnError="true" />
  			</else>
  		</if>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML/Upload LabUploadAction.java, 1.12, 1.13

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

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

Modified Files:
	LabUploadAction.java 
Log Message:
first pass at removing MD5 class

Index: LabUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML/Upload/LabUploadAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** LabUploadAction.java	6 Oct 2010 08:45:26 -0000	1.12
--- LabUploadAction.java	10 Nov 2010 10:36:46 -0000	1.13
***************
*** 94,101 ****
               if (localFileName != null){
                  InputStream  fis = new FileInputStream(localFileName); 
-                 FileUploadCheck fileC = new FileUploadCheck();  
                  int check = FileUploadCheck.UNSUCCESSFUL_SAVE;
                  try{
!                     check = fileC.addFile(filename,fis,proNo);
                      if (check != FileUploadCheck.UNSUCCESSFUL_SAVE){
                          outcome = "uploadedPreviously";
--- 94,100 ----
               if (localFileName != null){
                  InputStream  fis = new FileInputStream(localFileName); 
                  int check = FileUploadCheck.UNSUCCESSFUL_SAVE;
                  try{
!                     check = FileUploadCheck.addFile(filename,fis,proNo);
                      if (check != FileUploadCheck.UNSUCCESSFUL_SAVE){
                          outcome = "uploadedPreviously";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/bc/PathNet/pageUtil LabUploadAction.java, 1.9, 1.10

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

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

Modified Files:
	LabUploadAction.java 
Log Message:
first pass at removing MD5 class

Index: LabUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/bc/PathNet/pageUtil/LabUploadAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LabUploadAction.java	6 Oct 2010 08:03:24 -0000	1.9
--- LabUploadAction.java	10 Nov 2010 10:36:46 -0000	1.10
***************
*** 77,83 ****
            filename = importFile.getFileName();
            
!           FileUploadCheck fileC = new FileUploadCheck();
!           
!           int check = fileC.addFile(filename,is,proNo);
            is.reset();
            if (check != FileUploadCheck.UNSUCCESSFUL_SAVE){
--- 77,81 ----
            filename = importFile.getFileName();
            
!           int check = FileUploadCheck.addFile(filename,is,proNo);
            is.reset();
            if (check != FileUploadCheck.UNSUCCESSFUL_SAVE){

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab FileUploadCheck.java, 1.16, 1.17

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

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

Modified Files:
	FileUploadCheck.java 
Log Message:
first pass at removing MD5 class

Index: FileUploadCheck.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/FileUploadCheck.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FileUploadCheck.java	6 Oct 2010 21:52:14 -0000	1.16
--- FileUploadCheck.java	10 Nov 2010 10:36:45 -0000	1.17
***************
*** 1,3 ****
!  /**
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
   * This software is published under the GPL GNU General Public License.
--- 1,3 ----
! /**
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
   * This software is published under the GPL GNU General Public License.
***************
*** 34,139 ****
  import java.util.Hashtable;
  
  import org.apache.commons.lang.StringEscapeUtils;
  import org.oscarehr.util.MiscUtils;
  
  import oscar.oscarDB.DBHandler;
- import oscar.util.MD5;
  
  /**
-  *
   * @author Jay Gallagher
   */
! public class FileUploadCheck {
!   /* 
!   CREATE TABLE fileUploadCheck (
!   id int(10) NOT NULL auto_increment,
!   provider_no varchar(6) NOT NULL default '',
!   filename varchar(255) NOT NULL default '',
!   md5sum varchar(255),  
!   date_time  datetime NOT NULL,    
!   PRIMARY KEY  (id)
! )
!    */
!    
!    public FileUploadCheck() {
!    }
!    
!    public boolean hasFileBeenUploaded(InputStream is){      
!       String md5sum = getMd5Sum(is);     
!       return hasFileBeenUploaded(md5sum);
!    }
!    
!    
!    public boolean hasFileBeenUploaded(String md5sum){
!       boolean hasFileBeenUploaded = false;
!       try{         
!          
!          String sql = "select * from fileUploadCheck where md5sum = '"+md5sum+"' ";
!          ResultSet rs = DBHandler.GetSQL(sql);
!          if(rs.next()){
!             hasFileBeenUploaded = true;
!          }         
!       }catch(Exception e){
!          MiscUtils.getLogger().error("Error", e);
!       }
!       return hasFileBeenUploaded;
!    }
!    
!    public String getMd5Sum(InputStream is){  
!       String md5sum = null;
!       try{
!          md5sum = MD5.getHashString(is);                  
!       }catch(Exception e){
!          MiscUtils.getLogger().error("Error", e);
!       }
!       return md5sum;
!    }
!    
!    public Hashtable getFileInfo(String md5sum){
!       Hashtable fileInfo = new Hashtable();
!       try{         
!          
!          String sql = "select * from fileUploadCheck where md5sum = '"+md5sum+"' ";
!          ResultSet rs = DBHandler.GetSQL(sql);
!          if(rs.next()){
!             fileInfo.put("providerNo",oscar.Misc.getString(rs, "provider_no"));
!             fileInfo.put("filename", oscar.Misc.getString(rs, "filename"));
!             fileInfo.put("md5sum", oscar.Misc.getString(rs, "md5sum"));
!             fileInfo.put("dateTime",oscar.Misc.getString(rs, "date_time"));
!          }         
!       }catch(Exception e){
!          MiscUtils.getLogger().error("Error", e);
!       }
!       return fileInfo;
!    }
!    
!    
!    public static final int UNSUCCESSFUL_SAVE = -1;
!    /**
!     *Used to add a new file to the database, checks to see if it already has been added
!     */
!    public synchronized int addFile(String name, InputStream is,String provider) throws Exception{
!       int fileUploaded = UNSUCCESSFUL_SAVE;
!       try{
!          String md5sum = getMd5Sum(is);
!          if(!hasFileBeenUploaded(md5sum)){           
!             
!             String sql = "insert into fileUploadCheck (provider_no,filename,md5sum,date_time) values ('"+provider+"','"+StringEscapeUtils.escapeSql(name)+"','"+md5sum+"',now())";
!             MiscUtils.getLogger().debug(sql);
!             DBHandler.RunSQL(sql);
!             ResultSet rs = DBHandler.GetSQL("SELECT LAST_INSERT_ID() ");
!             if(rs.next()){
!                 fileUploaded= rs.getInt(1) ;
!             }       
!          }
!       }catch(SQLException conE){
!     	  MiscUtils.getLogger().error("Error", conE);
!          throw new Exception("Database Is not Running");
!       }catch(Exception e){
!          MiscUtils.getLogger().error("Error", e);
!       }
!       MiscUtils.getLogger().debug("returning "+fileUploaded);
!       return fileUploaded;
!    }
!   
  }
--- 34,114 ----
  import java.util.Hashtable;
  
+ import org.apache.commons.codec.digest.DigestUtils;
+ import org.apache.commons.io.IOUtils;
  import org.apache.commons.lang.StringEscapeUtils;
  import org.oscarehr.util.MiscUtils;
  
  import oscar.oscarDB.DBHandler;
  
  /**
   * @author Jay Gallagher
   */
! public final class FileUploadCheck {
! 
! 	private FileUploadCheck() {
! 		// no instantiation allowed
! 	}
! 
! 	private static boolean hasFileBeenUploaded(String md5sum) {
! 		boolean hasFileBeenUploaded = false;
! 		try {
! 
! 			String sql = "select * from fileUploadCheck where md5sum = '" + md5sum + "' ";
! 			ResultSet rs = DBHandler.GetSQL(sql);
! 			if (rs.next()) {
! 				hasFileBeenUploaded = true;
! 			}
! 		} catch (Exception e) {
! 			MiscUtils.getLogger().error("Error", e);
! 		}
! 		return hasFileBeenUploaded;
! 	}
! 
! 	public static Hashtable<String, String> getFileInfo(String md5sum) {
! 		Hashtable<String, String> fileInfo = new Hashtable<String, String>();
! 		try {
! 
! 			String sql = "select * from fileUploadCheck where md5sum = '" + md5sum + "' ";
! 			ResultSet rs = DBHandler.GetSQL(sql);
! 			if (rs.next()) {
! 				fileInfo.put("providerNo", oscar.Misc.getString(rs, "provider_no"));
! 				fileInfo.put("filename", oscar.Misc.getString(rs, "filename"));
! 				fileInfo.put("md5sum", oscar.Misc.getString(rs, "md5sum"));
! 				fileInfo.put("dateTime", oscar.Misc.getString(rs, "date_time"));
! 			}
! 		} catch (Exception e) {
! 			MiscUtils.getLogger().error("Error", e);
! 		}
! 		return fileInfo;
! 	}
! 
! 	public static final int UNSUCCESSFUL_SAVE = -1;
! 
! 	/**
! 	 *Used to add a new file to the database, checks to see if it already has been added
! 	 */
! 	public static synchronized int addFile(String name, InputStream is, String provider) throws Exception {
! 		int fileUploaded = UNSUCCESSFUL_SAVE;
! 		try {
! 			String md5sum = DigestUtils.md5Hex(IOUtils.toByteArray(is));
! 			if (!hasFileBeenUploaded(md5sum)) {
! 
! 				String sql = "insert into fileUploadCheck (provider_no,filename,md5sum,date_time) values ('" + provider + "','" + StringEscapeUtils.escapeSql(name) + "','" + md5sum + "',now())";
! 				MiscUtils.getLogger().debug(sql);
! 				DBHandler.RunSQL(sql);
! 				ResultSet rs = DBHandler.GetSQL("SELECT LAST_INSERT_ID() ");
! 				if (rs.next()) {
! 					fileUploaded = rs.getInt(1);
! 				}
! 			}
! 		} catch (SQLException conE) {
! 			MiscUtils.getLogger().error("Error", conE);
! 			throw new Exception("Database Is not Running");
! 		} catch (Exception e) {
! 			MiscUtils.getLogger().error("Error", e);
! 		}
! 		MiscUtils.getLogger().debug("returning " + fileUploaded);
! 		return fileUploaded;
! 	}
! 
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/pageUtil LabUploadAction.java, 1.18, 1.19 InsideLabUploadAction.java, 1.8, 1.9

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

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

Modified Files:
	LabUploadAction.java InsideLabUploadAction.java 
Log Message:
first pass at removing MD5 class

Index: InsideLabUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/pageUtil/InsideLabUploadAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InsideLabUploadAction.java	5 Jul 2010 19:38:57 -0000	1.8
--- InsideLabUploadAction.java	10 Nov 2010 10:36:46 -0000	1.9
***************
*** 53,58 ****
              
              is = new FileInputStream(filePath);
!             FileUploadCheck fileC = new FileUploadCheck();
!             int checkFileUploadedSuccessfully = fileC.addFile(file.getName(),is,proNo);            
              is.close();
              
--- 53,57 ----
              
              is = new FileInputStream(filePath);
!             int checkFileUploadedSuccessfully = FileUploadCheck.addFile(file.getName(),is,proNo);            
              is.close();
              

Index: LabUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/pageUtil/LabUploadAction.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** LabUploadAction.java	20 Jul 2010 17:59:25 -0000	1.18
--- LabUploadAction.java	10 Nov 2010 10:36:46 -0000	1.19
***************
*** 80,85 ****
  
  				is = new FileInputStream(file);
! 				FileUploadCheck fileC = new FileUploadCheck();
! 				int check = fileC.addFile(file.getName(), is, "0");
  				if (check != FileUploadCheck.UNSUCCESSFUL_SAVE) {
  					if ((audit = msgHandler.parse(service, filePath, check)) != null) {
--- 80,84 ----
  
  				is = new FileInputStream(file);
! 				int check = FileUploadCheck.addFile(file.getName(), is, "0");
  				if (check != FileUploadCheck.UNSUCCESSFUL_SAVE) {
  					if ((audit = msgHandler.parse(service, filePath, check)) != null) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/util MD5.java, 1.3, 1.4

[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-serv25789/web/WEB-INF/classes/src/oscar/util

Modified Files:
	MD5.java 
Log Message:
the only purpose of this commit is to store proof that apache.DigestUtils == oscar.utils.MD5 so I will delete this class next

Index: MD5.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/MD5.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MD5.java	23 Jun 2010 19:55:18 -0000	1.3
--- MD5.java	10 Nov 2010 10:16:28 -0000	1.4
***************
*** 32,35 ****
--- 32,37 ----
  import java.io.UnsupportedEncodingException;
  
+ import org.apache.commons.codec.digest.DigestUtils;
+ import org.apache.commons.io.FileUtils;
  import org.apache.log4j.Logger;
  import org.oscarehr.util.MiscUtils;
***************
*** 82,86 ****
       * @since ostermillerutils 1.00.00
       */
!     public static void main (String[] args){
          if (args.length == 0){
              logger.error("Please specify a file.");
--- 84,88 ----
       * @since ostermillerutils 1.00.00
       */
!     public static void main1(String[] args){
          if (args.length == 0){
              logger.error("Please specify a file.");
***************
*** 768,770 ****
--- 770,794 ----
          state.state[3] += d;
      }
+     
+     public static void main(String... argv) throws Exception
+     {
+     	File tmpDir=new File("/data/git/test/pictures");
+     	
+     	for (File file : tmpDir.listFiles())
+     	{
+     		try
+     		{
+     			byte[] b=FileUtils.readFileToByteArray(file);
+     			
+ 	    		String custom=MD5.getHashString(b);
+ 	    		String apache=DigestUtils.md5Hex(b);
+     		
+ 	    		logger.info(""+custom.equals(apache)+"\t : "+file.getName()+"\t : "+custom+" : "+apache);
+     		}
+     		catch (Exception e)
+     		{
+     			// squelch	
+     		}
+     	}    	
+     }
  }
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions DmsInboxManageAction.java, 1.13, 1.14

[jai <yg...@us...>]

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

Modified Files:
	DmsInboxManageAction.java 
Log Message:
- ID: 3105571
-add generics

Index: DmsInboxManageAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/DmsInboxManageAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DmsInboxManageAction.java	8 Nov 2010 22:07:22 -0000	1.13
--- DmsInboxManageAction.java	9 Nov 2010 21:39:12 -0000	1.14
***************
*** 647,664 ****
          String patientIdNamesStr="";
          List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink();
!         HashMap queueDocNos=new HashMap();
!         HashMap docType=new HashMap();
!         HashMap<Integer,List> patientDocs=new HashMap();
          DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO");
                  Demographic demo =new Demographic();
!                 List docsWithPatient=new ArrayList();
!                 Hashtable patientIdNames=new Hashtable();//lbData.patientName = demo.getLastName()+ ", "+demo.getFirstName();
!                 List<Integer> patientIds=new ArrayList();
                  Integer demoNo;
!                 HashMap docStatus=new HashMap();
                  String patientIdStr="";
                  StringBuilder patientIdBud=new StringBuilder();
!                 HashMap typeDocLab=new HashMap();
!                 List ListDocIds=new ArrayList();
          for(QueueDocumentLink q:qs){
               int qid=q.getQueueId();
--- 647,664 ----
          String patientIdNamesStr="";
          List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink();
!         HashMap<Integer,List<Integer>> queueDocNos=new HashMap<Integer,List<Integer>>();
!         HashMap<Integer,String> docType=new HashMap<Integer,String>();
!         HashMap<Integer,List<Integer>> patientDocs=new HashMap<Integer,List<Integer>>();
          DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO");
                  Demographic demo =new Demographic();
!                 List<Integer> docsWithPatient=new ArrayList<Integer>();
!                 HashMap<Integer,String> patientIdNames=new HashMap<Integer,String>();//lbData.patientName = demo.getLastName()+ ", "+demo.getFirstName();
!                 List<Integer> patientIds=new ArrayList<Integer>();
                  Integer demoNo;
!                 HashMap<Integer,String> docStatus=new HashMap<Integer,String>();
                  String patientIdStr="";
                  StringBuilder patientIdBud=new StringBuilder();
!                 HashMap<String,List<Integer>> typeDocLab=new HashMap<String,List<Integer>>();
!                 List<Integer> ListDocIds=new ArrayList<Integer>();
          for(QueueDocumentLink q:qs){
               int qid=q.getQueueId();
***************
*** 685,689 ****
  
              }
!              List providers=providerInboxRoutingDAO.getProvidersWithRoutingForDocument("DOC",Integer.toString(docid) );
               if(providers.size()>0){
                   ProviderInboxItem pii=(ProviderInboxItem)providers.get(0);
--- 685,689 ----
  
              }
!              List<ProviderInboxItem> providers=providerInboxRoutingDAO.getProvidersWithRoutingForDocument("DOC",Integer.toString(docid) );
               if(providers.size()>0){
                   ProviderInboxItem pii=(ProviderInboxItem)providers.get(0);
***************
*** 695,699 ****
                   patientDocs.put(demoNo,docsWithPatient);
               }else{
!                  docsWithPatient=new ArrayList();
                   docsWithPatient.add(docid);
                   patientDocs.put(demoNo, docsWithPatient);
--- 695,699 ----
                   patientDocs.put(demoNo,docsWithPatient);
               }else{
!                  docsWithPatient=new ArrayList<Integer>();
                   docsWithPatient.add(docid);
                   patientDocs.put(demoNo, docsWithPatient);
***************
*** 706,710 ****
  
               }else{
!                  List<Integer> ds=new ArrayList();
                   ds.add(docid);
                   queueDocNos.put(qid, ds);
--- 706,710 ----
  
               }else{
!                  List<Integer> ds=new ArrayList<Integer>();
                   ds.add(docid);
                   queueDocNos.put(qid, ds);
***************
*** 720,725 ****
          patientIdStr=patientIdBud.toString();
          typeDocLab.put("DOC", ListDocIds);
!         List normals=ListDocIds;//assume all documents are normal
!         List abnormals=new ArrayList();
          request.setAttribute("typeDocLab", typeDocLab);
          request.setAttribute("docStatus", docStatus);
--- 720,725 ----
          patientIdStr=patientIdBud.toString();
          typeDocLab.put("DOC", ListDocIds);
!         List<Integer> normals=ListDocIds;//assume all documents are normal
!         List<Integer> abnormals=new ArrayList<Integer>();
          request.setAttribute("typeDocLab", typeDocLab);
          request.setAttribute("docStatus", docStatus);
***************
*** 733,737 ****
          request.setAttribute("queueDocNos", queueDocNos);
          request.setAttribute("patientIdNamesStr",patientIdNamesStr);
!         request.setAttribute("queueIdNames", queueDAO.getQueuesHashMap());
          request.setAttribute("providerNo", providerNo);
          request.setAttribute("searchProviderNo", searchProviderNo);
--- 733,737 ----
          request.setAttribute("queueDocNos", queueDocNos);
          request.setAttribute("patientIdNamesStr",patientIdNamesStr);
!         request.setAttribute("queueIdNames", queueDAO.getHashMapOfQueues());
          request.setAttribute("providerNo", providerNo);
          request.setAttribute("searchProviderNo", searchProviderNo);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao QueueDao.java, 1.7, 1.8

[jai <yg...@us...>]

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

Modified Files:
	QueueDao.java 
Log Message:
-ID: 3105571
-change method's name

Index: QueueDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** QueueDao.java	9 Nov 2010 20:59:19 -0000	1.7
--- QueueDao.java	9 Nov 2010 21:38:15 -0000	1.8
***************
*** 25,29 ****
      }
  
!     public HashMap getQueuesHashMap(){
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);
--- 25,29 ----
      }
  
!     public HashMap getHashMapOfQueues(){
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao QueueDao.java, 1.6, 1.7

[jai <yg...@us...>]

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

Modified Files:
	QueueDao.java 
Log Message:
- ID: 3105571
-add generics to HashMap

Index: QueueDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QueueDao.java	9 Nov 2010 20:15:52 -0000	1.6
--- QueueDao.java	9 Nov 2010 20:59:19 -0000	1.7
***************
*** 28,34 ****
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);
!         List<Queue> result=new ArrayList();
          result=query.getResultList();
!         HashMap<Integer,String> hm=new HashMap();
          for(Queue que:result){
              hm.put(que.getId(),que.getName());
--- 28,34 ----
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);
!         List<Queue> result=new ArrayList<Queue>();
          result=query.getResultList();
!         HashMap<Integer,String> hm=new HashMap<Integer,String>();
          for(Queue que:result){
              hm.put(que.getId(),que.getName());

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao QueueDao.java, 1.5, 1.6

[jai <yg...@us...>]

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

Modified Files:
	QueueDao.java 
Log Message:
- ID: 3105571
-add generics to HashMap

Index: QueueDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** QueueDao.java	9 Nov 2010 14:04:47 -0000	1.5
--- QueueDao.java	9 Nov 2010 20:15:52 -0000	1.6
***************
*** 30,38 ****
          List<Queue> result=new ArrayList();
          result=query.getResultList();
!         HashMap ht=new HashMap();
          for(Queue que:result){
!             ht.put(que.getId(),que.getName());
          }
!         return ht;
      }
      public List<Hashtable> getQueues(){
--- 30,38 ----
          List<Queue> result=new ArrayList();
          result=query.getResultList();
!         HashMap<Integer,String> hm=new HashMap();
          for(Queue que:result){
!             hm.put(que.getId(),que.getName());
          }
!         return hm;
      }
      public List<Hashtable> getQueues(){

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes spring_jpa.xml, 1.16, 1.17

[Marc D. <hex...@us...>]

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

Modified Files:
	spring_jpa.xml 
Log Message:
eyeform follow up switched to JPA


Index: spring_jpa.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/spring_jpa.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** spring_jpa.xml	2 Dec 2009 20:05:39 -0000	1.16
--- spring_jpa.xml	9 Nov 2010 19:42:06 -0000	1.17
***************
*** 65,68 ****
--- 65,69 ----
  	<!-- Managed Beans -->
  	<context:component-scan base-package="org.oscarehr.common.dao" />
+ 	<context:component-scan base-package="org.oscarehr.eyeform.dao" />
  
  </beans>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eyeform followup.jsp, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13841/web/eyeform

Modified Files:
	followup.jsp 
Log Message:
eyeform follow up switched to JPA


Index: followup.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/followup.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** followup.jsp	4 Nov 2010 06:25:16 -0000	1.1
--- followup.jsp	9 Nov 2010 19:42:06 -0000	1.2
***************
*** 52,79 ****
              </td>
              </tr>
!             <tr>
!             <td>
!             	
!             	 
!             	<html:checkbox style="width: 10%;" value="checked" styleId="ack1" property="followup.ack1" onchange="setDischarge()" />
!             	
!             	discharge
!            <br>
!             
!             	 
!             	<html:checkbox style="width: 10%;" styleId="ack2" value="checked" property="followup.ack2" onchange="setSaveflag(true);setStat();" />
!             	
!             	
!             	STAT/PRN
!            <br>
! 
!             
!             	
!             	 
!             	<html:checkbox style="width: 10%;" value="checked" styleId="ack3" property="followup.ack3" onchange="setOpt();" />
!             	
!             	optom routine
!             </td>
!             </tr>
              <tr>
              <td><br/><html:submit value="submit"/></td>
--- 52,56 ----
              </td>
              </tr>
!            
              <tr>
              <td><br/><html:submit value="submit"/></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web NoteAddonAction.java, 1.3, 1.4

[Marc D. <hex...@us...>]

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

Modified Files:
	NoteAddonAction.java 
Log Message:
eyeform follow up switched to JPA


Index: NoteAddonAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NoteAddonAction.java	4 Nov 2010 06:25:16 -0000	1.3
--- NoteAddonAction.java	9 Nov 2010 19:42:06 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  import org.apache.struts.actions.DispatchAction;
  import org.oscarehr.PMmodule.dao.ProviderDao;
+ import org.oscarehr.common.dao.DemographicDao;
  import org.oscarehr.eyeform.dao.FollowUpDao;
  import org.oscarehr.eyeform.dao.ProcedureBookDao;
***************
*** 35,39 ****
--- 36,47 ----
  		ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO");
  		
+ 		ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao");
+ 		DemographicDao demographicDao = (DemographicDao)SpringUtils.getBean("demographicDao");
+ 		
  		List<FollowUp> followUps = followUpDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
+ 		for(FollowUp fu:followUps) {
+ 			fu.setProvider(providerDao.getProvider(fu.getFollowupProvider()));
+ 			fu.setDemographic(demographicDao.getDemographic(String.valueOf(fu.getDemographicNo())));			
+ 		}		
  		request.setAttribute("followUps",followUps);
  		

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model FollowUp.java, 1.1, 1.2 FollowUp.hbm.xml, 1.1, NONE

[Marc D. <hex...@us...>]

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

Modified Files:
	FollowUp.java 
Removed Files:
	FollowUp.hbm.xml 
Log Message:
eyeform follow up switched to JPA


Index: FollowUp.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/FollowUp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FollowUp.java	4 Nov 2010 06:25:16 -0000	1.1
--- FollowUp.java	9 Nov 2010 19:42:06 -0000	1.2
***************
*** 3,23 ****
  import java.util.Date;
  
  import org.oscarehr.common.model.Demographic;
  import org.oscarehr.common.model.Provider;
  
! public class FollowUp {
  
  	private Integer id;
  	private int appointmentNo;
  	private Demographic demographic;
  	private int demographicNo;	
  	private int timespan;
  	private String timeframe;
  	private String followupProvider;
  	private Date date;
  	
! 	private String ack1;
! 	private String ack2;
! 	private String ack3;
  	private Provider provider;
  	
--- 3,48 ----
  import java.util.Date;
  
+ import javax.persistence.Column;
+ import javax.persistence.Entity;
+ import javax.persistence.GeneratedValue;
+ import javax.persistence.GenerationType;
+ import javax.persistence.Id;
+ import javax.persistence.Table;
+ import javax.persistence.Temporal;
+ import javax.persistence.TemporalType;
+ import javax.persistence.Transient;
+ 
+ import org.oscarehr.common.model.AbstractModel;
  import org.oscarehr.common.model.Demographic;
  import org.oscarehr.common.model.Provider;
  
! @Entity
! @Table(name="eyeform_followup")
! public class FollowUp extends AbstractModel<Integer> {
  
+ 	@Id
+     @GeneratedValue(strategy = GenerationType.IDENTITY)
  	private Integer id;
+ 	
+ 	@Column(name="appointment_no")
  	private int appointmentNo;
+ 	
+ 	@Transient
  	private Demographic demographic;
+ 	
+ 	@Column(name="demographic_no")
  	private int demographicNo;	
  	private int timespan;
  	private String timeframe;
+ 	@Column(name="followup_provider")
  	private String followupProvider;
+ 	
+ 	@Temporal(TemporalType.TIMESTAMP)
  	private Date date;
  	
! 	//private String ack1;
! 	//private String ack2;
! 	//private String ack3;
! 	@Transient
  	private Provider provider;
  	
***************
*** 71,74 ****
--- 96,100 ----
  		this.date = date;
  	}
+ 	/*
  	public String getAck1() {
  		return ack1;
***************
*** 89,92 ****
--- 115,119 ----
  		this.ack3 = ack3;
  	}
+ 	*/
  	public int getDemographicNo() {
  		return demographicNo;

--- FollowUp.hbm.xml DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao FollowUpDao.java, 1.1, 1.2

[Marc D. <hex...@us...>]

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

Modified Files:
	FollowUpDao.java 
Log Message:
eyeform follow up switched to JPA


Index: FollowUpDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/FollowUpDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FollowUpDao.java	4 Nov 2010 06:25:16 -0000	1.1
--- FollowUpDao.java	9 Nov 2010 19:42:06 -0000	1.2
***************
*** 3,13 ****
  import java.util.List;
  
  import org.oscarehr.eyeform.model.FollowUp;
! import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
! public class FollowUpDao extends HibernateDaoSupport {
  
  	public void save(FollowUp obj) {		
! 		this.getHibernateTemplate().saveOrUpdate(obj);
  	}
  	/*
--- 3,25 ----
  import java.util.List;
  
+ import javax.persistence.Query;
+ 
+ import org.oscarehr.common.dao.AbstractDao;
  import org.oscarehr.eyeform.model.FollowUp;
! import org.springframework.stereotype.Repository;
  
! @Repository
! public class FollowUpDao extends AbstractDao<FollowUp> {
  
+ 	public FollowUpDao() {
+ 		super(FollowUp.class);
+ 	}
+ 	
  	public void save(FollowUp obj) {		
! 		if(obj.getId()!=null && obj.getId().intValue()>0) {
! 			entityManager.merge(obj);
! 		} else {
! 			entityManager.persist(obj);
! 		}
  	}
  	/*
***************
*** 18,26 ****
  	
  	public FollowUp find(int id) {
! 		return (FollowUp)getHibernateTemplate().get(FollowUp.class, id);
  	}
  	
  	public List<FollowUp> getByAppointmentNo(int appointmentNo) {
! 		return this.getHibernateTemplate().find("FROM FollowUp fu WHERE fu.appointmentNo = ?",appointmentNo);
  	}
  }
--- 30,46 ----
  	
  	public FollowUp find(int id) {
! 		Query query = entityManager.createQuery("select x from "+modelClass.getSimpleName()+" x where x.id=?1");
! 	    query.setParameter(1, id);
! 	    return(getSingleResultOrNull(query));
! 		//return (FollowUp)getHibernateTemplate().get(FollowUp.class, id);
  	}
  	
  	public List<FollowUp> getByAppointmentNo(int appointmentNo) {
! 		Query query = entityManager.createQuery("select x from "+modelClass.getSimpleName()+" x where x.appointmentNo=?1");
! 		query.setParameter(1, appointmentNo);
! 	    
! 		@SuppressWarnings("unchecked")
! 	    List<FollowUp> results=query.getResultList();
! 	    return(results);
  	}
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/casemgmt newCaseManagementView.jsp, 1.134, 1.135

[annie <ann...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14385/web/casemgmt

Modified Files:
	newCaseManagementView.jsp 
Log Message:
fixed the NullPointer Exception

Index: newCaseManagementView.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagementView.jsp,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** newCaseManagementView.jsp	12 Oct 2010 04:42:55 -0000	1.134
--- newCaseManagementView.jsp	9 Nov 2010 14:45:28 -0000	1.135
***************
*** 568,572 ****
  			<%
  				//display last saved note for editing
! 				if (note.getNoteId().intValue() == savedId )
  				{
  					found = true;
--- 568,572 ----
  			<%
  				//display last saved note for editing
! 				if (note.getNoteId()!=null && !"".equals(note.getNoteId()) && note.getNoteId().intValue() == savedId )
  				{
  					found = true;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao QueueDao.java, 1.4, 1.5

[jai <yg...@us...>]

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

Modified Files:
	QueueDao.java 
Log Message:
- ID: 3105571
-hashtable to hashmap

Index: QueueDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueueDao.java	6 Nov 2010 17:36:11 -0000	1.4
--- QueueDao.java	9 Nov 2010 14:04:47 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  
  import java.util.ArrayList;
+ import java.util.HashMap;
  import java.util.Hashtable;
  import java.util.List;
***************
*** 24,33 ****
      }
  
!     public Hashtable getQueuesHashtable(){
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);
          List<Queue> result=new ArrayList();
          result=query.getResultList();
!         Hashtable ht=new Hashtable();
          for(Queue que:result){
              ht.put(que.getId(),que.getName());
--- 25,34 ----
      }
  
!     public HashMap getQueuesHashMap(){
          String q="select q from Queue q";
          Query query=entityManager.createQuery(q);
          List<Queue> result=new ArrayList();
          result=query.getResultList();
!         HashMap ht=new HashMap();
          for(Queue que:result){
              ht.put(que.getId(),que.getName());

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs gerrit_working_model.txt, 1.11, 1.12

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

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

Modified Files:
	gerrit_working_model.txt 
Log Message:
added instructions on importing converted cvs into gerrit

Index: gerrit_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gerrit_working_model.txt	9 Nov 2010 05:49:34 -0000	1.11
--- gerrit_working_model.txt	9 Nov 2010 08:00:19 -0000	1.12
***************
*** 95,97 ****
  To backup the system, the site directory should be backed up (/var/gerrrit/* will include the site directory), the mysql database (reviewdb). The only thing lost then would be your ssh keys as I don't think those are backup-able upon server change (though they might be).
  
! There's logs in /var/gerrit/review_site/logs/* that should be cleaned out every once in a while. They generally have no use for us. 
\ No newline at end of file
--- 95,119 ----
  To backup the system, the site directory should be backed up (/var/gerrrit/* will include the site directory), the mysql database (reviewdb). The only thing lost then would be your ssh keys as I don't think those are backup-able upon server change (though they might be).
  
! There's logs in /var/gerrit/review_site/logs/* that should be cleaned out every once in a while. They generally have no use for us.
! 
! 
! --------------------------------------
! Importing existing repository From CVS
! --------------------------------------
! On the gerrit server do the following : 
! 
! convert cvs to git
! ------------------
! - cd /tmp
! - CVSROOT=:pserver:ano...@os...:/cvsroot/oscarmcmaster cvs login
! - git cvsimport -v -d :pserver:ano...@os...:/cvsroot/oscarmcmaster -C test2  oscar_mcmaster/docs
! 
! import git into gerrit
! ----------------------
! - gerrit.sh stop
! - cd /var/gerrit/review_site/git
! - cp /tmp/test2/.git test2.git
! - cp test.git/config test2.git/config
! - in mysql : insert into projects (use_contributor_agreements,submit_type,name) values ('N','M','test2');
! - gerrit.sh start
! 

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs gerrit_working_model.txt, 1.10, 1.11

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

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

Modified Files:
	gerrit_working_model.txt 
Log Message:
added some more information on how we should manage our gerrit server

Index: gerrit_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gerrit_working_model.txt	9 Nov 2010 01:38:44 -0000	1.10
--- gerrit_working_model.txt	9 Nov 2010 05:49:34 -0000	1.11
***************
*** 93,94 ****
--- 93,97 ----
  Because of the above, we could live with an infrequent backup, i.e. once a week. If the server fails, we can restore it from a week old backup, then restore the git repository from sourceforge. The only things we'd lose then is any new user registrations in the last week.
  
+ To backup the system, the site directory should be backed up (/var/gerrrit/* will include the site directory), the mysql database (reviewdb). The only thing lost then would be your ssh keys as I don't think those are backup-able upon server change (though they might be).
+ 
+ There's logs in /var/gerrit/review_site/logs/* that should be cleaned out every once in a while. They generally have no use for us. 
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/META-INF context.xml, 1.10, NONE

[Toby B. <tob...@us...>]

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

Removed Files:
	context.xml 
Log Message:
no message

--- context.xml DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/META-INF context.xml, 1.9.2.2, NONE

[Toby B. <tob...@us...>]

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

Removed Files:
      Tag: RELEASE_9_12
	context.xml 
Log Message:
no message

--- context.xml DELETED ---