oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF web.xml, 1.62, 1.63

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

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

Modified Files:
	web.xml 
Log Message:
filter was never enabled so it was useless code and it was set to the default anyways

Index: web.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/web.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** web.xml	24 Oct 2010 10:20:21 -0000	1.62
--- web.xml	24 Nov 2010 03:06:37 -0000	1.63
***************
*** 1,51 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
! <!--
!     Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved.
!     This software is published under the GPL GNU General Public License.
!     This program is free software; you can redistribute it and/or
!     modify it under the terms of the GNU General Public License
!     as published by the Free Software Foundation; either version 2
!     of the License, or (at your option) any later version.
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!     GNU General Public License for more details. You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! 
!     <OSCAR TEAM>
! 
!     This software was written for the
!     Department of Family Medicine
!     McMaster University
!     Hamilton
!     Ontario, Canada
! -->
  <web-app id="WebApp_ID">
  	<display-name>oscar_mcmaster</display-name>
!    <context-param>
!         <param-name>contextConfigLocation</param-name>
!         <param-value>/WEB-INF/applicationContext*.xml</param-value>
!     </context-param>
!     <!--  filter to set character encoding on each request -->
!     <filter>
!         <filter-name>SetCharacterEncoding</filter-name>
!         <filter-class>filters.SetCharacterEncodingFilter</filter-class>
!         <init-param>
!             <param-name>encoding</param-name>
!             <param-value>ISO-8859-1</param-value>
!         </init-param>
!         <init-param>
!             <param-name>ignore</param-name>
!             <param-value>false</param-value>
!         </init-param>
!     </filter>
!     <filter>
! 	<filter-name>ComponentFilter</filter-name>
! 	<filter-class>
! 		org.caisi.comp.web.WebComponentFilter
! 	</filter-class>
!   	</filter>
  
  	<filter>
--- 1,23 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
! 	<!--
! 		Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. This software is published under the GPL GNU General Public License. This program is free software; you can redistribute it and/or modify it under the terms
! 		of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
! 		the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
! 		Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <OSCAR TEAM> This software was written for the Department of Family Medicine McMaster University Hamilton Ontario, Canada
! 	-->
  <web-app id="WebApp_ID">
  	<display-name>oscar_mcmaster</display-name>
! 	<context-param>
! 		<param-name>contextConfigLocation</param-name>
! 		<param-value>/WEB-INF/applicationContext*.xml</param-value>
! 	</context-param>
! 
! 	<filter>
! 		<filter-name>ComponentFilter</filter-name>
! 		<filter-class>
! 			org.caisi.comp.web.WebComponentFilter
! 		</filter-class>
! 	</filter>
  
  	<filter>
***************
*** 107,111 ****
  	</filter>
  
!     <filter-mapping>
  		<filter-name>ComponentFilter</filter-name>
  		<url-pattern>/mod/*</url-pattern>
--- 79,83 ----
  	</filter>
  
! 	<filter-mapping>
  		<filter-name>ComponentFilter</filter-name>
  		<url-pattern>/mod/*</url-pattern>
***************
*** 143,152 ****
  		<listener-class>oscar.login.Startup</listener-class>
  	</listener>
!     <listener>
!         <listener-class>org.oscarehr.common.web.OscarSpringContextLoaderListener</listener-class>
!     </listener>
!     <listener>
!         <listener-class>org.oscarehr.util.ContextStartupListener</listener-class>
!     </listener>
  
  	<servlet>
--- 115,124 ----
  		<listener-class>oscar.login.Startup</listener-class>
  	</listener>
! 	<listener>
! 		<listener-class>org.oscarehr.common.web.OscarSpringContextLoaderListener</listener-class>
! 	</listener>
! 	<listener>
! 		<listener-class>org.oscarehr.util.ContextStartupListener</listener-class>
! 	</listener>
  
  	<servlet>
***************
*** 185,189 ****
  		<load-on-startup>1</load-on-startup>
  	</servlet>
!         <servlet>
  		<servlet-name>pdfCustomedCreator</servlet-name>
  		<servlet-class>oscar.form.pdfservlet.FrmCustomedPDFServlet</servlet-class>
--- 157,161 ----
  		<load-on-startup>1</load-on-startup>
  	</servlet>
! 	<servlet>
  		<servlet-name>pdfCustomedCreator</servlet-name>
  		<servlet-class>oscar.form.pdfservlet.FrmCustomedPDFServlet</servlet-class>
***************
*** 224,243 ****
  		<load-on-startup>0</load-on-startup>
  	</servlet>
!     <servlet>
!         <servlet-name>FileUpload</servlet-name>
!         <servlet-class>FileUpload</servlet-class>
!     </servlet>
!     <servlet>
!         <servlet-name>FileUpload2</servlet-name>
!         <servlet-class>FileUpload2</servlet-class>
!     </servlet>
!     <servlet>
!         <servlet-name>Uploader</servlet-name>
!         <servlet-class>Uploader</servlet-class>
!     </servlet>
!     <servlet>
!         <servlet-name>newUploader</servlet-name>
!         <servlet-class>oscar.newOscarLab.Uploader</servlet-class>
!     </servlet>
  	<servlet>
  		<servlet-name>HsfoQuartzSchedulerServlet</servlet-name>
--- 196,215 ----
  		<load-on-startup>0</load-on-startup>
  	</servlet>
! 	<servlet>
! 		<servlet-name>FileUpload</servlet-name>
! 		<servlet-class>FileUpload</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>FileUpload2</servlet-name>
! 		<servlet-class>FileUpload2</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>Uploader</servlet-name>
! 		<servlet-class>Uploader</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>newUploader</servlet-name>
! 		<servlet-class>oscar.newOscarLab.Uploader</servlet-class>
! 	</servlet>
  	<servlet>
  		<servlet-name>HsfoQuartzSchedulerServlet</servlet-name>
***************
*** 245,264 ****
  		<load-on-startup>0</load-on-startup>
  	</servlet>
!     <servlet>
!         <servlet-name>PatientListByAppointment</servlet-name>
!         <servlet-class>oscar.oscarReport.data.PatientListByAppt</servlet-class>
!     </servlet>
!     <servlet>
! 	 	<servlet-name>RxCloneService</servlet-name>
! 	 	<servlet-class>oscar.oscarRx.server.service.RxCloneServiceImpl</servlet-class>
!     </servlet>
!     <servlet>
! 	 	<servlet-name>ImageRenderingServlet</servlet-name>
! 	 	<servlet-class>org.oscarehr.ui.servlet.ImageRenderingServlet</servlet-class>
!     </servlet>
!     <servlet>
! 	 	<servlet-name>ContentRenderingServlet</servlet-name>
! 	 	<servlet-class>org.oscarehr.ui.servlet.ContentRenderingServlet</servlet-class>
!     </servlet>
  	<servlet>
  		<servlet-name>eformViewForPdfGenerationServlet</servlet-name>
--- 217,236 ----
  		<load-on-startup>0</load-on-startup>
  	</servlet>
! 	<servlet>
! 		<servlet-name>PatientListByAppointment</servlet-name>
! 		<servlet-class>oscar.oscarReport.data.PatientListByAppt</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>RxCloneService</servlet-name>
! 		<servlet-class>oscar.oscarRx.server.service.RxCloneServiceImpl</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>ImageRenderingServlet</servlet-name>
! 		<servlet-class>org.oscarehr.ui.servlet.ImageRenderingServlet</servlet-class>
! 	</servlet>
! 	<servlet>
! 		<servlet-name>ContentRenderingServlet</servlet-name>
! 		<servlet-class>org.oscarehr.ui.servlet.ContentRenderingServlet</servlet-class>
! 	</servlet>
  	<servlet>
  		<servlet-name>eformViewForPdfGenerationServlet</servlet-name>
***************
*** 266,270 ****
  	</servlet>
  
!     <servlet>
  		<servlet-name>DATISExportTest</servlet-name>
  		<servlet-class>org.oscarehr.PMmodule.exporter.TestServlet</servlet-class>
--- 238,242 ----
  	</servlet>
  
! 	<servlet>
  		<servlet-name>DATISExportTest</servlet-name>
  		<servlet-class>org.oscarehr.PMmodule.exporter.TestServlet</servlet-class>
***************
*** 286,290 ****
  	</servlet-mapping>
  
!     <servlet-mapping>
  		<servlet-name>action</servlet-name>
  		<url-pattern>*.do</url-pattern>
--- 258,262 ----
  	</servlet-mapping>
  
! 	<servlet-mapping>
  		<servlet-name>action</servlet-name>
  		<url-pattern>*.do</url-pattern>
***************
*** 298,302 ****
  		<url-pattern>/form/createpdf</url-pattern>
  	</servlet-mapping>
!         <servlet-mapping>
  		<servlet-name>pdfCustomedCreator</servlet-name>
  		<url-pattern>/form/createcustomedpdf</url-pattern>
--- 270,274 ----
  		<url-pattern>/form/createpdf</url-pattern>
  	</servlet-mapping>
! 	<servlet-mapping>
  		<servlet-name>pdfCustomedCreator</servlet-name>
  		<url-pattern>/form/createcustomedpdf</url-pattern>
***************
*** 330,379 ****
  		<url-pattern>/servlet/oscar.DocumentUploadServlet</url-pattern>
  	</servlet-mapping>
!         <servlet-mapping>
!                 <servlet-name>PatientListByAppointment</servlet-name>
!                 <url-pattern>/patientlistbyappt</url-pattern>
!         </servlet-mapping>
!     <servlet-mapping>
!         <servlet-name>FileUpload</servlet-name>
!         <url-pattern>/FileUpload</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
!         <servlet-name>FileUpload2</servlet-name>
!         <url-pattern>/FileUpload2</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
!         <servlet-name>Uploader</servlet-name>
!         <url-pattern>/Uploader</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
!         <servlet-name>newUploader</servlet-name>
!         <url-pattern>/newUploader</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
! 	 	<servlet-name>RxCloneService</servlet-name>
! 	 	<url-pattern>/oscar.oscarRx.CloneRx/service/rxcloneservice</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
! 	 	<servlet-name>ImageRenderingServlet</servlet-name>
! 	 	<url-pattern>/imageRenderingServlet</url-pattern>
!     </servlet-mapping>
!     <servlet-mapping>
! 	 	<servlet-name>ContentRenderingServlet</servlet-name>
! 	 	<url-pattern>/contentRenderingServlet/*</url-pattern>
!     </servlet-mapping>
  	<servlet-mapping>
  		<servlet-name>eformViewForPdfGenerationServlet</servlet-name>
  		<url-pattern>/eformViewForPdfGenerationServlet</url-pattern>
  	</servlet-mapping>
!     <servlet-mapping>
!         <servlet-name>jsp</servlet-name>
!         <url-pattern>*.json</url-pattern>
!     </servlet-mapping>
  
!     <session-config>
!     	<session-timeout>120</session-timeout> <!-- 120minutes -->
!     </session-config>
  
!     <welcome-file-list>
  		<welcome-file>index.jsp</welcome-file>
  		<welcome-file>index.html</welcome-file>
--- 302,351 ----
  		<url-pattern>/servlet/oscar.DocumentUploadServlet</url-pattern>
  	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>PatientListByAppointment</servlet-name>
! 		<url-pattern>/patientlistbyappt</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>FileUpload</servlet-name>
! 		<url-pattern>/FileUpload</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>FileUpload2</servlet-name>
! 		<url-pattern>/FileUpload2</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>Uploader</servlet-name>
! 		<url-pattern>/Uploader</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>newUploader</servlet-name>
! 		<url-pattern>/newUploader</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>RxCloneService</servlet-name>
! 		<url-pattern>/oscar.oscarRx.CloneRx/service/rxcloneservice</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>ImageRenderingServlet</servlet-name>
! 		<url-pattern>/imageRenderingServlet</url-pattern>
! 	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>ContentRenderingServlet</servlet-name>
! 		<url-pattern>/contentRenderingServlet/*</url-pattern>
! 	</servlet-mapping>
  	<servlet-mapping>
  		<servlet-name>eformViewForPdfGenerationServlet</servlet-name>
  		<url-pattern>/eformViewForPdfGenerationServlet</url-pattern>
  	</servlet-mapping>
! 	<servlet-mapping>
! 		<servlet-name>jsp</servlet-name>
! 		<url-pattern>*.json</url-pattern>
! 	</servlet-mapping>
  
! 	<session-config>
! 		<session-timeout>120</session-timeout> <!-- 120minutes -->
! 	</session-config>
  
! 	<welcome-file-list>
  		<welcome-file>index.jsp</welcome-file>
  		<welcome-file>index.html</welcome-file>
***************
*** 381,397 ****
  	</welcome-file-list>
  
- <!-- Previously added because of a security audit, reasons for adding was to hide code which is not relavent in an open source project. 
- 	
-     <error-page>
- 	   <error-code>404</error-code>
- 	   <location>/404.jsp</location>
- 	</error-page>
- 
-     <error-page>
- 	   <error-code>500</error-code>
- 	   <location>/500.jsp</location>
- 	</error-page>
- -->
- 
  	<taglib>
  		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
--- 353,356 ----
***************
*** 408,418 ****
  
  	<taglib>
!        <taglib-uri>/WEB-INF/struts-menu.tld</taglib-uri>
!        <taglib-location>/WEB-INF/struts-menu.tld</taglib-location>
!      </taglib>
!      <taglib>
!        <taglib-uri>/WEB-INF/struts-menu-el.tld</taglib-uri>
!        <taglib-location>/WEB-INF/struts-menu-el.tld</taglib-location>
!      </taglib>
  
  </web-app>
--- 367,377 ----
  
  	<taglib>
! 		<taglib-uri>/WEB-INF/struts-menu.tld</taglib-uri>
! 		<taglib-location>/WEB-INF/struts-menu.tld</taglib-location>
! 	</taglib>
! 	<taglib>
! 		<taglib-uri>/WEB-INF/struts-menu-el.tld</taglib-uri>
! 		<taglib-location>/WEB-INF/struts-menu-el.tld</taglib-location>
! 	</taglib>
  
  </web-app>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/lookup LookupList.jsp, 1.8, 1.9 LookupTree.jsp, 1.5, 1.6

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

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

Modified Files:
	LookupList.jsp LookupTree.jsp 
Log Message:
remove duplicate contentType specification

Index: LookupTree.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/lookup/LookupTree.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LookupTree.jsp	15 Nov 2010 03:26:14 -0000	1.5
--- LookupTree.jsp	24 Nov 2010 02:53:19 -0000	1.6
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=ISO-8859-1"	%>
- 
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
--- 1,2 ----

Index: LookupList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/lookup/LookupList.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LookupList.jsp	15 Nov 2010 03:26:14 -0000	1.8
--- LookupList.jsp	24 Nov 2010 02:53:19 -0000	1.9
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=ISO-8859-1"	%>
- 
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/GenericIntake DATISExport.jsp, 1.7, 1.8

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

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

Modified Files:
	DATISExport.jsp 
Log Message:
remove duplicate contentType specification

Index: DATISExport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/GenericIntake/DATISExport.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DATISExport.jsp	16 Nov 2010 08:35:38 -0000	1.7
--- DATISExport.jsp	24 Nov 2010 02:53:19 -0000	1.8
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=ISO-8859-1"
-     %>
  <%@ include file="/taglibs.jsp"%>
  <%@page
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarReport patientlist.jsp, 1.6, 1.7

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

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

Modified Files:
	patientlist.jsp 
Log Message:
remove duplicate contentType specification

Index: patientlist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/patientlist.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** patientlist.jsp	18 Aug 2010 14:55:40 -0000	1.6
--- patientlist.jsp	24 Nov 2010 02:53:19 -0000	1.7
***************
*** 15,19 ****
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  "http://www.w3.org/TR/html4/loose.dtd">
- <%@ page contentType="text/html;charset=ISO-8859-1"%>
  <html>
  <head>
--- 15,18 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form HSFOFlowsheet.jsp, 1.11, 1.12 HSFORegistrationFrm.jsp, 1.6, 1.7

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

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

Modified Files:
	HSFOFlowsheet.jsp HSFORegistrationFrm.jsp 
Log Message:
remove duplicate contentType specification

Index: HSFORegistrationFrm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/HSFORegistrationFrm.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HSFORegistrationFrm.jsp	16 Nov 2010 08:42:42 -0000	1.6
--- HSFORegistrationFrm.jsp	24 Nov 2010 02:53:19 -0000	1.7
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=iso-8859-1"
- 	%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
--- 1,2 ----

Index: HSFOFlowsheet.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/HSFOFlowsheet.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HSFOFlowsheet.jsp	16 Nov 2010 08:42:42 -0000	1.11
--- HSFOFlowsheet.jsp	24 Nov 2010 02:53:19 -0000	1.12
***************
*** 1,4 ****
! <%@page contentType="text/html; charset=iso-8859-1"
! 	 import="oscar.util.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
--- 1,3 ----
! <%@page import="oscar.util.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formrourke2006p2.jsp, 1.16, 1.17 formrourke2006p4.jsp, 1.15, 1.16 formrourke2006p3.jsp, 1.15, 1.16 formrourke2006p1.jsp, 1.18, 1.19

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

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

Modified Files:
	formrourke2006p2.jsp formrourke2006p4.jsp formrourke2006p3.jsp 
	formrourke2006p1.jsp 
Log Message:
remve redundant charset specification

Index: formrourke2006p2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourke2006p2.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** formrourke2006p2.jsp	15 Nov 2010 03:26:15 -0000	1.16
--- formrourke2006p2.jsp	24 Nov 2010 02:49:33 -0000	1.17
***************
*** 25,29 ****
  --%>
  
- <%@ page contentType="text/html; charset=ISO-8859-1"%>
  <%@ page import="oscar.util.*, oscar.form.*, oscar.form.data.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 25,28 ----

Index: formrourke2006p1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourke2006p1.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** formrourke2006p1.jsp	15 Nov 2010 03:26:14 -0000	1.18
--- formrourke2006p1.jsp	24 Nov 2010 02:49:33 -0000	1.19
***************
*** 24,28 ****
   */
  --%>
- <%@ page contentType="text/html; charset=ISO-8859-1"%>
  <%@ page import="oscar.util.*, oscar.form.*, oscar.form.data.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 24,27 ----

Index: formrourke2006p4.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourke2006p4.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** formrourke2006p4.jsp	15 Nov 2010 03:26:14 -0000	1.15
--- formrourke2006p4.jsp	24 Nov 2010 02:49:33 -0000	1.16
***************
*** 25,29 ****
  --%>
  
- <%@ page contentType="text/html; charset=ISO-8859-1"%>
  <%@ page import="oscar.util.*, oscar.form.*, oscar.form.data.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 25,28 ----

Index: formrourke2006p3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourke2006p3.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** formrourke2006p3.jsp	15 Nov 2010 03:26:14 -0000	1.15
--- formrourke2006p3.jsp	24 Nov 2010 02:49:33 -0000	1.16
***************
*** 25,29 ****
  --%>
  
- <%@ page contentType="text/html; charset=ISO-8859-1"%>
  <%@ page import="oscar.util.*, oscar.form.*, oscar.form.data.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 25,28 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form/study ar2ping.jsp, 1.19, 1.20

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

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

Modified Files:
	ar2ping.jsp 
Log Message:
remve redundant charset specification

Index: ar2ping.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/study/ar2ping.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ar2ping.jsp	18 Oct 2010 03:52:02 -0000	1.19
--- ar2ping.jsp	24 Nov 2010 02:49:32 -0000	1.20
***************
*** 29,33 ****
  
  
- <%--@ page contentType="text/xml" --%>
  <%@ page import="java.lang.reflect.*, java.sql.*"%>
  
--- 29,32 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule do_download.jsp, 1.5, 1.6

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

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

Modified Files:
	do_download.jsp 
Log Message:
remve redundant charset specification

Index: do_download.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/do_download.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** do_download.jsp	9 Jul 2010 17:44:14 -0000	1.5
--- do_download.jsp	24 Nov 2010 02:49:33 -0000	1.6
***************
*** 1,5 ****
  
! <%@page import="org.oscarehr.util.MiscUtils"%><%@ page contentType="text/html; charset=ISO-8859-1"%>
! <%@page import="java.io.FileInputStream"%>
  <%@page import="java.io.OutputStream"%>
  <%@page import="java.io.File"%>
--- 1,4 ----
  
! <%@page import="org.oscarehr.util.MiscUtils"%><%@page import="java.io.FileInputStream"%>
  <%@page import="java.io.OutputStream"%>
  <%@page import="java.io.File"%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest attachConsultation.jsp, 1.12, 1.13

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

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

Modified Files:
	attachConsultation.jsp 
Log Message:
remve redundant charset specification

Index: attachConsultation.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/attachConsultation.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** attachConsultation.jsp	7 Jul 2010 21:01:33 -0000	1.12
--- attachConsultation.jsp	24 Nov 2010 02:49:32 -0000	1.13
***************
*** 42,46 ****
  <%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
  <%@page import="org.oscarehr.util.SessionConstants"%>
- <%@ page contentType="text/html; charset=ISO-8859-1"%>
  <%
  
--- 42,45 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/Admin/ProgramView bed_reservation_change_report.jsp, 1.5, 1.6 bed_check_report.jsp, 1.10, 1.11

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

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

Modified Files:
	bed_reservation_change_report.jsp bed_check_report.jsp 
Log Message:
removed redundant charset specification

Index: bed_check_report.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/ProgramView/bed_check_report.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** bed_check_report.jsp	16 Nov 2010 08:35:39 -0000	1.10
--- bed_check_report.jsp	24 Nov 2010 02:46:43 -0000	1.11
***************
*** 13,18 ****
  	This software was written for Centre for Research on Inner City Health, St. Michael's Hospital, Toronto, Ontario, Canada
  -->
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <%@ include file="/taglibs.jsp"%>
  
--- 13,16 ----

Index: bed_reservation_change_report.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/ProgramView/bed_reservation_change_report.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** bed_reservation_change_report.jsp	16 Nov 2010 08:35:39 -0000	1.5
--- bed_reservation_change_report.jsp	24 Nov 2010 02:46:43 -0000	1.6
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <%@ include file="/taglibs.jsp"%>
  
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/Admin/Organization ORGTree.jsp, 1.4, 1.5

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

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

Modified Files:
	ORGTree.jsp 
Log Message:
removed redundant charset specification

Index: ORGTree.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/Organization/ORGTree.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ORGTree.jsp	15 Nov 2010 03:26:19 -0000	1.4
--- ORGTree.jsp	24 Nov 2010 02:46:43 -0000	1.5
***************
*** 1,5 ****
  <!-- Source:web/PMmodule/Admin/Organization/ProgramView/ORGTree.jsp -->
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <%@ include file="../../../taglibs.jsp"%>
  <%@page import="com.quatro.common.KeyConstants;"%>
--- 1,3 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON/specialtyBilling/fluBilling onDbAddFluBilling.jsp, 1.6, 1.7

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/specialtyBilling/fluBilling
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11728/web/billing/CA/ON/specialtyBilling/fluBilling

Modified Files:
	onDbAddFluBilling.jsp 
Log Message:
removed redundant charset specification

Index: onDbAddFluBilling.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/specialtyBilling/fluBilling/onDbAddFluBilling.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** onDbAddFluBilling.jsp	15 Nov 2010 03:26:18 -0000	1.6
--- onDbAddFluBilling.jsp	24 Nov 2010 02:46:43 -0000	1.7
***************
*** 1,4 ****
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <%@ page import="java.util.*, oscar.oscarBilling.ca.on.pageUtil.*"%>
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule HealthSafety.jsp, 1.8, 1.9

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

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

Modified Files:
	HealthSafety.jsp 
Log Message:
removed redundant charset specification

Index: HealthSafety.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/HealthSafety.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HealthSafety.jsp	15 Nov 2010 03:26:18 -0000	1.8
--- HealthSafety.jsp	24 Nov 2010 02:46:42 -0000	1.9
***************
*** 1,7 ****
  <%@ include file="/taglibs.jsp"%>
  
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%> 
- 
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  
--- 1,4 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingONMRI.jsp, 1.10, 1.11 billingONPriInvoice.jsp, 1.5, 1.6 billingON3rdInv.jsp, 1.12, 1.13

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11728/web/billing/CA/ON

Modified Files:
	billingONMRI.jsp billingONPriInvoice.jsp billingON3rdInv.jsp 
Log Message:
removed redundant charset specification

Index: billingONMRI.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONMRI.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** billingONMRI.jsp	16 Nov 2010 08:35:37 -0000	1.10
--- billingONMRI.jsp	24 Nov 2010 02:46:43 -0000	1.11
***************
*** 28,33 ****
  
  
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <%@ page import="java.util.*,java.sql.*,oscar.*,oscar.util.*,java.net.*"
  	errorPage="errorpage.jsp"%>
--- 28,31 ----

Index: billingONPriInvoice.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONPriInvoice.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** billingONPriInvoice.jsp	16 Nov 2010 08:35:37 -0000	1.5
--- billingONPriInvoice.jsp	24 Nov 2010 02:46:43 -0000	1.6
***************
*** 17,22 ****
   */
   -->
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <%@ page
  	import="oscar.util.*,oscar.oscarBilling.ca.on.pageUtil.*,oscar.oscarBilling.ca.on.data.*"%>
--- 17,20 ----

Index: billingON3rdInv.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingON3rdInv.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** billingON3rdInv.jsp	16 Nov 2010 08:35:37 -0000	1.12
--- billingON3rdInv.jsp	24 Nov 2010 02:46:43 -0000	1.13
***************
*** 28,33 ****
  %>
  
- <%@page contentType="text/html; charset=ISO-8859-1"
- 	%>
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <%@ page
--- 28,31 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/appointment appointmentstatussetting.jsp, 1.6, 1.7 appointmentstatusedit.jsp, 1.6, 1.7

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

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

Modified Files:
	appointmentstatussetting.jsp appointmentstatusedit.jsp 
Log Message:
get rid of some redundant charset specifications

Index: appointmentstatussetting.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment/appointmentstatussetting.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** appointmentstatussetting.jsp	15 Nov 2010 03:26:14 -0000	1.6
--- appointmentstatussetting.jsp	24 Nov 2010 02:44:34 -0000	1.7
***************
*** 1,3 ****
- <%@ page contentType="text/html;charset=ISO-8859-1" %>
  <%@ page import="java.util.*,oscar.appt.status.model.*"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 1,2 ----

Index: appointmentstatusedit.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment/appointmentstatusedit.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** appointmentstatusedit.jsp	15 Nov 2010 03:26:14 -0000	1.6
--- appointmentstatusedit.jsp	24 Nov 2010 02:44:34 -0000	1.7
***************
*** 1,3 ****
- <%@ page contentType="text/html;charset=ISO-8859-1" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/casemgmt newEncounterLayout.jsp, 1.53, 1.54

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

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

Modified Files:
	newEncounterLayout.jsp 
Log Message:
get rid of some redundant charset specifications

Index: newEncounterLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** newEncounterLayout.jsp	15 Nov 2010 05:19:28 -0000	1.53
--- newEncounterLayout.jsp	24 Nov 2010 02:44:34 -0000	1.54
***************
*** 1,3 ****
- <%@page contentType="text/html;charset=ISO-8859-1"%>
  <!-- 
  /*
--- 1,2 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/BC billingSVCTrayAssoc.jsp, 1.5, 1.6 receivePayment.jsp, 1.4, 1.5 billType_frag.jsp, 1.4, 1.5

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11022/web/billing/CA/BC

Modified Files:
	billingSVCTrayAssoc.jsp receivePayment.jsp billType_frag.jsp 
Log Message:
get rid of some redundant charset specifications

Index: receivePayment.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/receivePayment.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** receivePayment.jsp	15 Nov 2010 03:26:17 -0000	1.4
--- receivePayment.jsp	24 Nov 2010 02:44:34 -0000	1.5
***************
*** 1,4 ****
! <%@page contentType="text/html; charset=iso-8859-1" 
! 	import="java.sql.*" errorPage=""%>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 1,3 ----
! <%@page import="java.sql.*" errorPage=""%>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>

Index: billingSVCTrayAssoc.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingSVCTrayAssoc.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** billingSVCTrayAssoc.jsp	15 Nov 2010 03:26:17 -0000	1.5
--- billingSVCTrayAssoc.jsp	24 Nov 2010 02:44:34 -0000	1.6
***************
*** 1,4 ****
! <%@page contentType="text/html; charset=iso-8859-1" 
! 	import="java.sql.*" errorPage=""%>
  <%@taglib uri="http://displaytag.sf.net" prefix="display"%>
  <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 1,3 ----
! <%@page import="java.sql.*" errorPage=""%>
  <%@taglib uri="http://displaytag.sf.net" prefix="display"%>
  <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>

Index: billType_frag.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billType_frag.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** billType_frag.jsp	15 Nov 2010 03:26:17 -0000	1.4
--- billType_frag.jsp	24 Nov 2010 02:44:34 -0000	1.5
***************
*** 25,30 ****
    */
  -->
! <%@page contentType="text/html; charset=iso-8859-1" 
! 	import="java.sql.*" errorPage=""%>
  <%@page
  	import="java.math.*, java.util.*, java.sql.*, oscar.*, java.net.*,oscar.oscarBilling.ca.bc.MSP.*,oscar.oscarBilling.ca.bc.data.*;"%>
--- 25,29 ----
    */
  -->
! <%@page import="java.sql.*" errorPage=""%>
  <%@page
  	import="java.math.*, java.util.*, java.sql.*, oscar.*, java.net.*,oscar.oscarBilling.ca.bc.MSP.*,oscar.oscarBilling.ca.bc.data.*;"%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffDirectoryWalker.java, 1.17, 1.18

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

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

Modified Files:
	GrepStuffDirectoryWalker.java 
Log Message:
exclude a third party js file

Index: GrepStuffDirectoryWalker.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GrepStuffDirectoryWalker.java	16 Nov 2010 08:29:25 -0000	1.17
--- GrepStuffDirectoryWalker.java	24 Nov 2010 02:38:37 -0000	1.18
***************
*** 83,87 ****
  
  			// --- hack for ignore case comparison ---
! 			checkContains(relativePath, fileContentsLowered, "latin-1", "use utf-8");
  			checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8");
  			checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8");
--- 83,90 ----
  
  			// --- hack for ignore case comparison ---
! 			if (fileContentsLowered.contains("latin-1") && !relativePath.endsWith("calendar-sv.js")) {
! 				violations.put("latin-1" + ", " + "use utf-8", relativePath);
! 			}
! 
  			checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8");
  			checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8");

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs git_eclipse_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-serv20472/docs

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
update information on how to fix rejected code and change id's

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_eclipse_working_model.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** git_eclipse_working_model.txt	17 Nov 2010 00:38:02 -0000	1.10
--- git_eclipse_working_model.txt	23 Nov 2010 11:58:20 -0000	1.11
***************
*** 73,77 ****
  If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git commited" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
! Now to share these changes with everyone else, i.e. commited to the main repository... (You must have commited locally first, you need to understand git's local/remote/distributed repositories.) 
  
  Now, right click on the project, go to team -> push. 
--- 73,77 ----
  If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git commited" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
! Now to share these changes with everyone else, i.e. committed to the main repository... (You must have committed locally first) 
  
  Now, right click on the project, go to team -> push. 
***************
*** 92,93 ****
--- 92,126 ----
  
  The reason for the above is because of the review model of gerrit. You don't want to do one big commit because it will be a nightmare to review and approve. Think about the example of converting 300 DBHandler calls into maybe 100 JPA objects. If that was 1 commit, it would take for ever to review and verify that commit. If you made 300 separate commits, the review process could at least proceed incrementally and in manageable size chunks. The push is for a similar reason, if you had 300 separate commits and you pushed all at once at the end of 6 months, there will be a sudden flood of 300 commits to review and it would be a huge backlog. If you pushed those 300 commits over a 6 month period, review of the commits could have started as soon as the first push was done. 
+ 
+ 
+ --------------
+ ChangeId Hooks
+ --------------
+ Change ID Hook will add a change ID to every commit you make. The benefit of this is if you change / fix a commit and resubmit it, gerrit will use the changeId to replace the previous commit. The problem with this is that it only works on the command line git for now, eclipse does not yet support hooks. 
+ 
+ To install the changeId hook, you need to first grab a copy from the test project. On the command line, while in the test repository do "scp -p -P 29418 r6s...@so...:hooks/commit-msg .git/hooks/commit-msg". This will effecitvely enable the changeId hook for the test project. Now to make it work for any other project just copy the .git/hooks/commit-msg to the other projects. You need to make sure the file is chmoded +x as it's a shell script.
+ 
+ 
+ -----------------------
+ Fixing previous commits
+ -----------------------
+ The easiest way to fix a previous commit is to continue working the way we did in CVS... i.e. make another commit with the changes/fixes. For those who are more adventurous there is a native git/gerrit routine to do this but the commands are also not supported in eclipse.
+ 
+ From the command line :
+ - make sure your work space has the gerrit changes you want to fix. If you don't you can explicitly fetch the branches by looking at the URL's of the commit on the gerrit pages.
+ - set one branch to the end of the set of changes, i.e. master.
+ - create and switch to another branch to the commit that needs to be fixed, i.e. "git branch -b fix 4dj45" where 4dj45 is the first part of the SHA of the commit.
+ - make the changes you need to make
+ - "git commit -a --amend" the change.
+ - switch back to the end point, i.e. git checkout master
+ - rebase from the amended commit to here, i.e. "git rebase -i fix", 
+ 	- it will bring up a list of subsequent commits, change the "pick" on each commit to "edit"
+ 	- it will then iterate through all the commits,
+ 		- it will checkout the next commit, warn you about conflicts, you need to
+ 		- resolve any conflict, make any changes you need
+ 		- then "git commit -a --amend"
+ 		- then "git rebase --continue"  
+ - git push origin HEAD:refs/for/master
+ - git branch -D fix
+ 
+ Now if you have changeId's enabled, the above will replace the previous commits, if you don't the commits will show up in git as a string of new commits and the old commits should just be abandoned.       
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs gerrit_working_model.txt, 1.14, 1.15

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

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

Modified Files:
	gerrit_working_model.txt 
Log Message:
enhance security so we don't get gerrit submit spam

Index: gerrit_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gerrit_working_model.txt	15 Nov 2010 01:27:35 -0000	1.14
--- gerrit_working_model.txt	22 Nov 2010 08:58:08 -0000	1.15
***************
*** 53,61 ****
  		- click add and it should list it as an added key on the screen.
  	- now on the bottom of the screen there's a link that says "continue" click that, now you should be at the your "code review dashboard" screen.
! - on the top left of the screen, click on admin -> groups. Create a new group called "code approvers"
  - on the top left of the screen, click on admin -> projects. Then select "all projects", then select "access".
  	- add the new permissions category="code review", group name="code approvers", range=+2/-2
  	- add the new permissions category="verified", group name="code approvers", range=+1/-1
  	- add the new permissions category="submit", group name="code approvers", range=+1
  
  Add a project (from client / developer machine)
--- 53,65 ----
  		- click add and it should list it as an added key on the screen.
  	- now on the bottom of the screen there's a link that says "continue" click that, now you should be at the your "code review dashboard" screen.
! - on the top left of the screen, click on admin -> groups. Create a new group called "code approvers", Create a second group called "code submitters"
  - on the top left of the screen, click on admin -> projects. Then select "all projects", then select "access".
  	- add the new permissions category="code review", group name="code approvers", range=+2/-2
  	- add the new permissions category="verified", group name="code approvers", range=+1/-1
  	- add the new permissions category="submit", group name="code approvers", range=+1
+ 	- add the new permissions category="Code Review", group name="code submitters", range=+1/-1
+ 	- add the new permissions category="Forge Identity", group name="code submitters", range=+1
+ 	- add the new permissions category="Read Access", group name="code submitters", range=+2
+ 	- remove permissions for "Registered Users" : "Forge Identity","Code Review", and "Submit" 
  
  Add a project (from client / developer machine)

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx Preview2.jsp, 1.14.2.4, 1.14.2.5 ViewScript2.jsp, 1.1.2.10, 1.1.2.11

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

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

Modified Files:
      Tag: RELEASE_9_12
	Preview2.jsp ViewScript2.jsp 
Log Message:
provider phone # overrides clinic (for st. joe's)


Index: ViewScript2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/ViewScript2.jsp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** ViewScript2.jsp	4 Oct 2010 15:26:04 -0000	1.1.2.10
--- ViewScript2.jsp	18 Nov 2010 20:25:45 -0000	1.1.2.11
***************
*** 83,86 ****
--- 83,91 ----
      createAnewRx = "javascript:clearPending('')";
  
+ String providerPhone = null;
+ org.oscarehr.common.model.Provider pprovider = org.oscarehr.util.LoggedInInfo.loggedInInfo.get().loggedInProvider;
+ if(pprovider.getWorkPhone() != null && pprovider.getWorkPhone().length()>0) {
+ 	providerPhone = pprovider.getWorkPhone();
+ }
  // for satellite clinics
  Vector vecAddressName = null;
***************
*** 122,126 ****
  		Site s = sites.get(i);
          vecAddressName.add(s.getName());
!         vecAddress.add("<b>"+doctorName+"</b><br>"+s.getName()+"<br>"+s.getAddress() + "<br>" + s.getCity() + ", " + s.getProvince() + " " + s.getPostal() + "<br>"+rb.getString("RxPreview.msgTel")+": " + s.getPhone() + "<br>"+rb.getString("RxPreview.msgFax")+": " + s.getFax());
          if (s.getName().equals(location))
          	session.setAttribute("RX_ADDR",String.valueOf(i));
--- 127,135 ----
  		Site s = sites.get(i);
          vecAddressName.add(s.getName());
!         String phone = s.getPhone();
!         if(providerPhone !=null) {
!         	phone = providerPhone;
!         }
!         vecAddress.add("<b>"+doctorName+"</b><br>"+s.getName()+"<br>"+s.getAddress() + "<br>" + s.getCity() + ", " + s.getProvince() + " " + s.getPostal() + "<br>"+rb.getString("RxPreview.msgTel")+": " + phone + "<br>"+rb.getString("RxPreview.msgFax")+": " + s.getFax());
          if (s.getName().equals(location))
          	session.setAttribute("RX_ADDR",String.valueOf(i));
***************
*** 155,159 ****
      for(int i=0; i<temp0.length; i++) {
          vecAddressName.add(temp0[i]);
!         vecAddress.add("<b>"+doctorName+"</b><br>"+temp0[i]+"<br>"+temp1[i] + "<br>" + temp2[i] + ", " + temp3[i] + " " + temp4[i] + "<br>"+rb.getString("RxPreview.msgTel")+": " + temp5[i] + "<br>"+rb.getString("RxPreview.msgFax")+": " + temp6[i]);
      }
  
--- 164,172 ----
      for(int i=0; i<temp0.length; i++) {
          vecAddressName.add(temp0[i]);
!         String phone = temp5[i];
!         if(providerPhone != null) {
!         	phone = providerPhone;
!         }
!         vecAddress.add("<b>"+doctorName+"</b><br>"+temp0[i]+"<br>"+temp1[i] + "<br>" + temp2[i] + ", " + temp3[i] + " " + temp4[i] + "<br>"+rb.getString("RxPreview.msgTel")+": " + phone + "<br>"+rb.getString("RxPreview.msgFax")+": " + temp6[i]);
      }
  
***************
*** 164,167 ****
--- 177,181 ----
      System.out.println(provider.getClinicName().replaceAll("\\(\\d{6}\\)",""));
  }
+ 
  String comment = (String) request.getSession().getAttribute("comment");
  RxPharmacyData pharmacyData = new RxPharmacyData();

Index: Preview2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview2.jsp,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -C2 -d -r1.14.2.4 -r1.14.2.5
*** Preview2.jsp	17 May 2010 15:51:34 -0000	1.14.2.4
--- Preview2.jsp	18 Nov 2010 20:25:45 -0000	1.14.2.5
***************
*** 116,119 ****
--- 116,125 ----
  }
  
+ String providerPhone = null;
+ org.oscarehr.common.model.Provider pprovider = org.oscarehr.util.LoggedInInfo.loggedInInfo.get().loggedInProvider;
+ if(pprovider.getWorkPhone() != null && pprovider.getWorkPhone().length()>0) {
+ 	providerPhone = pprovider.getWorkPhone();
+ }
+ 
  
  oscar.oscarRx.data.RxPatientData.Patient patient = new oscar.oscarRx.data.RxPatientData().getPatient(bean.getDemographicNo());
***************
*** 164,176 ****
                                                                      value="<%= StringEscapeUtils.escapeHtml(clinicTitle.replaceAll("(<br>)","\\\n")) %>" />
                                                              <input type="hidden" name="clinicPhone"
!                                                                     value="<%= StringEscapeUtils.escapeHtml(provider.getClinicPhone()) %>" />
                                                              <input type="hidden" name="clinicFax"
                                                                      value="<%= StringEscapeUtils.escapeHtml(provider.getClinicFax()) %>" />
                                                      </c:when>
                                                      <c:otherwise>
                                                              <input type="hidden" name="clinicName"
                                                                      value="<c:out value="${infirmaryView_programAddress}"/>" />
                                                              <input type="hidden" name="clinicPhone"
!                                                                     value="<c:out value="${infirmaryView_programTel}"/>" />
                                                              <input type="hidden" name="clinicFax"
                                                                      value="<c:out value="${infirmaryView_programFax}"/>" />
--- 170,189 ----
                                                                      value="<%= StringEscapeUtils.escapeHtml(clinicTitle.replaceAll("(<br>)","\\\n")) %>" />
                                                              <input type="hidden" name="clinicPhone"
!                                                                     value="<%= StringEscapeUtils.escapeHtml(providerPhone==null?provider.getClinicPhone():providerPhone) %>" />
                                                              <input type="hidden" name="clinicFax"
                                                                      value="<%= StringEscapeUtils.escapeHtml(provider.getClinicFax()) %>" />
                                                      </c:when>
                                                      <c:otherwise>
+                                                     		<%
+                                                     			String phone = providerPhone;
+                                                     			if(phone == null) {
+                                                     				phone = (String)session.getAttribute("infirmaryView_programTel");
+                                                     			}
+                                                     			request.setAttribute("phone",phone);
+                                                     		%>
                                                              <input type="hidden" name="clinicName"
                                                                      value="<c:out value="${infirmaryView_programAddress}"/>" />
                                                              <input type="hidden" name="clinicPhone"
!                                                                     value="<c:out value="${phone}"/>" />
                                                              <input type="hidden" name="clinicFax"
                                                                      value="<c:out value="${infirmaryView_programFax}"/>" />
***************
*** 197,201 ****
                                                              <%= provider.getClinicCity() %>&nbsp;&nbsp;<%=provider.getClinicProvince()%>&nbsp;&nbsp;
                                                  <%= provider.getClinicPostal() %><br>
!                                                 <bean:message key="RxPreview.msgTel"/>: <%= provider.getClinicPhone() %><br>
                                                  <oscar:oscarPropertiesCheck property="RXFAX" value="yes">
                                                      <bean:message key="RxPreview.msgFax"/>: <%= provider.getClinicFax() %><br>
--- 210,214 ----
                                                              <%= provider.getClinicCity() %>&nbsp;&nbsp;<%=provider.getClinicProvince()%>&nbsp;&nbsp;
                                                  <%= provider.getClinicPostal() %><br>
!                                                 <bean:message key="RxPreview.msgTel"/>: <%= providerPhone==null?provider.getClinicPhone():providerPhone %><br>
                                                  <oscar:oscarPropertiesCheck property="RXFAX" value="yes">
                                                      <bean:message key="RxPreview.msgFax"/>: <%= provider.getClinicFax() %><br>
***************
*** 203,209 ****
                                                      </c:when>
                                                      <c:otherwise>
                                                              <c:out value="${infirmaryView_programAddress}" escapeXml="false" />
                                                              <br />
!                                                     <bean:message key="RxPreview.msgTel"/>: <c:out value="${infirmaryView_programTel}" />
                                                              <br />
                                                              <oscar:oscarPropertiesCheck property="RXFAX" value="yes">
--- 216,230 ----
                                                      </c:when>
                                                      <c:otherwise>
+                                                     <%
+                                                     			String phone = providerPhone;
+                                                     			if(phone == null) {
+                                                     				phone = (String)session.getAttribute("infirmaryView_programTel");
+                                                     			}
+                                                     			request.setAttribute("phone",phone);
+                                                     		%>
+                                                     		
                                                              <c:out value="${infirmaryView_programAddress}" escapeXml="false" />
                                                              <br />
!                                                     <bean:message key="RxPreview.msgTel"/>: <c:out value="${phone}" />
                                                              <br />
                                                              <oscar:oscarPropertiesCheck property="RXFAX" value="yes">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWorkflow/rules Rh_workflow.drl, 1.2, 1.3

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

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

Modified Files:
	Rh_workflow.drl 
Log Message:
Removed System.out from drl file

Index: Rh_workflow.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWorkflow/rules/Rh_workflow.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Rh_workflow.drl	20 Dec 2006 21:38:11 -0000	1.2
--- Rh_workflow.drl	17 Nov 2010 17:22:00 -0000	1.3
***************
*** 42,47 ****
          </parameter>
          <java:condition>w.getGestationAge() == -1</java:condition>
!         <java:consequence>   
! System.out.println("setting 0");              
                w.setColour("red");
          </java:consequence>
--- 42,46 ----
          </parameter>
          <java:condition>w.getGestationAge() == -1</java:condition>
!         <java:consequence>                 
                w.setColour("red");
          </java:consequence>
***************
*** 55,60 ****
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &lt; 24</java:condition>
!         <java:consequence>   
! System.out.println("setting 1");              
                w.setColour("#ccccff");
          </java:consequence>
--- 54,58 ----
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &lt; 24</java:condition>
!         <java:consequence>                 
                w.setColour("#ccccff");
          </java:consequence>
***************
*** 68,73 ****
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &gt;= 24</java:condition>
!         <java:consequence>   
! System.out.println("setting 2");              
                w.setColour("orange");
          </java:consequence>
--- 66,70 ----
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &gt;= 24</java:condition>
!         <java:consequence>                 
                w.setColour("orange");
          </java:consequence>
***************
*** 80,85 ****
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &gt;= 27</java:condition>
!         <java:consequence>           
! System.out.println("setting 3");      
                w.setColour("red");
          </java:consequence>
--- 77,81 ----
          <java:condition>w.isCurrentState("1")</java:condition>
          <java:condition>w.getGestationAge() &gt;= 27</java:condition>
!         <java:consequence>                 
                w.setColour("red");
          </java:consequence>
***************
*** 93,98 ****
          <java:condition>w.isCurrentState("2")</java:condition>
          <java:condition>w.getGestationAge() &lt;= 28</java:condition>
!         <java:consequence>   
!         System.out.println("setting 4");   
                w.setColour("#ccccff");
          </java:consequence>
--- 89,93 ----
          <java:condition>w.isCurrentState("2")</java:condition>
          <java:condition>w.getGestationAge() &lt;= 28</java:condition>
!         <java:consequence>      
                w.setColour("#ccccff");
          </java:consequence>
***************
*** 107,112 ****
          <java:condition>w.getGestationAge() &gt; 28</java:condition>
          <java:consequence>              
!               w.setColour("red");
! System.out.println("setting 5");   
          </java:consequence>
      </rule>
--- 102,106 ----
          <java:condition>w.getGestationAge() &gt; 28</java:condition>
          <java:consequence>              
!               w.setColour("red");  
          </java:consequence>
      </rule>
***************
*** 119,124 ****
          <java:condition>w.isCurrentState("3")</java:condition>
          <java:condition>w.getGestationAge() &gt; 42</java:condition>
!         <java:consequence>              
!             System.out.println("setting 6");   
                w.setColour("red");
          </java:consequence>
--- 113,117 ----
          <java:condition>w.isCurrentState("3")</java:condition>
          <java:condition>w.getGestationAge() &gt; 42</java:condition>
!         <java:consequence>                 
                w.setColour("red");
          </java:consequence>
***************
*** 131,136 ****
          </parameter>
          <java:condition>w.isCurrentState("4")</java:condition>
!         <java:consequence>         
!             System.out.println("setting 7");   
                w.setColour("orange");
          </java:consequence>
--- 124,128 ----
          </parameter>
          <java:condition>w.isCurrentState("4")</java:condition>
!         <java:consequence>            
                w.setColour("orange");
          </java:consequence>
***************
*** 143,148 ****
          </parameter>
          <java:condition>w.isCurrentState("5")</java:condition>
!         <java:consequence>  
!               System.out.println("setting 8 ");            
                w.setColour("orange");
          </java:consequence>
--- 135,139 ----
          </parameter>
          <java:condition>w.isCurrentState("5")</java:condition>
!         <java:consequence>             
                w.setColour("orange");
          </java:consequence>
***************
*** 154,159 ****
          </parameter>
          <java:condition>w.isCurrentState("6")</java:condition>
!         <java:consequence>  
!               System.out.println("setting 9 ");            
                w.setColour("yellow");
          </java:consequence>
--- 145,149 ----
          </parameter>
          <java:condition>w.isCurrentState("6")</java:condition>
!         <java:consequence>              
                w.setColour("yellow");
          </java:consequence>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/patient test.txt, 1.1, 1.2

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

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

Modified Files:
	test.txt 
Log Message:
Removed System.out from text file

Index: test.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/patient/test.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test.txt	21 Jul 2003 17:46:16 -0000	1.1
--- test.txt	17 Nov 2010 17:20:39 -0000	1.2
***************
*** 1290,1295 ****
        if(SxmlMisc.getXmlContent(temp, "<xml_nadref>","</xml_nadref>")!= null) savedar1risk.setProperty("75", "xml_nadref");
       }
!     //System.out.println(SxmlMisc.getXmlContent(temp, "<xml_cp3s>","</xml_cp3s>") +" "+savedar1risk.getProperty("3") );
! 	out.println(checklist.doStuff(new String("../webapps/"+oscarVariables.getProperty("project_home")+"/provider/obarchecklist_99_12.xml"), savedar1risk));
  }	
  }
--- 1290,1294 ----
        if(SxmlMisc.getXmlContent(temp, "<xml_nadref>","</xml_nadref>")!= null) savedar1risk.setProperty("75", "xml_nadref");
       }
!     	out.println(checklist.doStuff(new String("../webapps/"+oscarVariables.getProperty("project_home")+"/provider/obarchecklist_99_12.xml"), savedar1risk));
  }	
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets inrFlowsheet.drl, 1.1, 1.2 hypertension.drl, 1.3, 1.4 chf.drl, 1.1, 1.2 diab.drl, 1.5, 1.6 hiv.drl, 1.2, 1.3

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

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

Modified Files:
	inrFlowsheet.drl hypertension.drl chf.drl diab.drl hiv.drl 
Log Message:
Removed System.out from drl files

Index: diab.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/diab.drl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** diab.drl	28 Nov 2008 17:18:36 -0000	1.5
--- diab.drl	17 Nov 2010 16:43:22 -0000	1.6
***************
*** 46,50 ****
          <java:condition>m.getLastDateRecordedInMonths("REBG") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("REBG 1 getting called");
                m.addRecommendation("REBG","Blood Glucose hasn't been reviewed in "+m.getLastDateRecordedInMonths("REBG")+" months");
          </java:consequence>
--- 46,50 ----
          <java:condition>m.getLastDateRecordedInMonths("REBG") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("REBG 1 getting called");
                m.addRecommendation("REBG","Blood Glucose hasn't been reviewed in "+m.getLastDateRecordedInMonths("REBG")+" months");
          </java:consequence>
***************
*** 57,61 ****
          <java:condition>m.getLastDateRecordedInMonths("REBG") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("REBG 2 getting called");
                m.addWarning("REBG","Blood Glucose hasn't been reviewed in "+m.getLastDateRecordedInMonths("REBG")+" months");
          </java:consequence>
--- 57,61 ----
          <java:condition>m.getLastDateRecordedInMonths("REBG") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("REBG 2 getting called");
                m.addWarning("REBG","Blood Glucose hasn't been reviewed in "+m.getLastDateRecordedInMonths("REBG")+" months");
          </java:consequence>
***************
*** 68,72 ****
          <java:condition>m.getLastDateRecordedInMonths("REBG") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("REBG 3 getting called");
                m.addWarning("REBG","Blood Glucose hasn't been reviewed");
          </java:consequence>
--- 68,72 ----
          <java:condition>m.getLastDateRecordedInMonths("REBG") ==  -1</java:condition>
          <java:consequence>              
!               m.log("REBG 3 getting called");
                m.addWarning("REBG","Blood Glucose hasn't been reviewed");
          </java:consequence>
***************
*** 82,86 ****
          <java:condition>m.getLastDateRecordedInMonths("A1C") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("A1C 1 getting called");
                m.addRecommendation("A1C","An A1C hasn't been recorded in "+m.getLastDateRecordedInMonths("A1C")+" months");
          </java:consequence>
--- 82,86 ----
          <java:condition>m.getLastDateRecordedInMonths("A1C") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("A1C 1 getting called");
                m.addRecommendation("A1C","An A1C hasn't been recorded in "+m.getLastDateRecordedInMonths("A1C")+" months");
          </java:consequence>
***************
*** 93,97 ****
          <java:condition>m.getLastDateRecordedInMonths("A1C") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("A1C 2 getting called");
                m.addWarning("A1C","An A1C hasn't been recorded in "+m.getLastDateRecordedInMonths("A1C")+" months");
          </java:consequence>
--- 93,97 ----
          <java:condition>m.getLastDateRecordedInMonths("A1C") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("A1C 2 getting called");
                m.addWarning("A1C","An A1C hasn't been recorded in "+m.getLastDateRecordedInMonths("A1C")+" months");
          </java:consequence>
***************
*** 104,108 ****
          <java:condition>m.getLastDateRecordedInMonths("A1C") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("A1C 3 getting called");
                m.addWarning("A1C","no A1C values has been recorded");
          </java:consequence>
--- 104,108 ----
          <java:condition>m.getLastDateRecordedInMonths("A1C") ==  -1</java:condition>
          <java:consequence>              
!               m.log("A1C 3 getting called");
                m.addWarning("A1C","no A1C values has been recorded");
          </java:consequence>
***************
*** 118,122 ****
          <java:condition>m.getLastDateRecordedInMonths("DMED") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("DMED 1 getting called");
                m.addRecommendation("DMED","DM Med changes haven't been recorded in "+m.getLastDateRecordedInMonths("DMED")+" months");
          </java:consequence>
--- 118,122 ----
          <java:condition>m.getLastDateRecordedInMonths("DMED") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("DMED 1 getting called");
                m.addRecommendation("DMED","DM Med changes haven't been recorded in "+m.getLastDateRecordedInMonths("DMED")+" months");
          </java:consequence>
***************
*** 129,133 ****
          <java:condition>m.getLastDateRecordedInMonths("DMED") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("DMED 2 getting called");
                m.addWarning("DMED","DM Med changes haven't been recorded in "+m.getLastDateRecordedInMonths("DMED")+" months");
          </java:consequence>
--- 129,133 ----
          <java:condition>m.getLastDateRecordedInMonths("DMED") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("DMED 2 getting called");
                m.addWarning("DMED","DM Med changes haven't been recorded in "+m.getLastDateRecordedInMonths("DMED")+" months");
          </java:consequence>
***************
*** 140,144 ****
          <java:condition>m.getLastDateRecordedInMonths("DMED") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("DMED 3 getting called");
                m.addWarning("DMED","no DM Med changes have been recorded");
          </java:consequence>
--- 140,144 ----
          <java:condition>m.getLastDateRecordedInMonths("DMED") ==  -1</java:condition>
          <java:consequence>              
!               m.log("DMED 3 getting called");
                m.addWarning("DMED","no DM Med changes have been recorded");
          </java:consequence>
***************
*** 156,160 ****
          <java:condition>m.getLastDateRecordedInMonths("BP") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("BP 1 getting called");
                m.addRecommendation("BP","BP hasn't been recorded in "+m.getLastDateRecordedInMonths("BP")+" months");
          </java:consequence>
--- 156,160 ----
          <java:condition>m.getLastDateRecordedInMonths("BP") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("BP 1 getting called");
                m.addRecommendation("BP","BP hasn't been recorded in "+m.getLastDateRecordedInMonths("BP")+" months");
          </java:consequence>
***************
*** 167,171 ****
          <java:condition>m.getLastDateRecordedInMonths("BP") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("BP 2 getting called");
                m.addWarning("BP","BP hasn't been recorded in "+m.getLastDateRecordedInMonths("BP")+" months");
          </java:consequence>
--- 167,171 ----
          <java:condition>m.getLastDateRecordedInMonths("BP") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("BP 2 getting called");
                m.addWarning("BP","BP hasn't been recorded in "+m.getLastDateRecordedInMonths("BP")+" months");
          </java:consequence>
***************
*** 178,182 ****
          <java:condition>m.getLastDateRecordedInMonths("BP") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("BP 3 getting called");
                m.addWarning("BP","no BP has been recorded");
          </java:consequence>
--- 178,182 ----
          <java:condition>m.getLastDateRecordedInMonths("BP") ==  -1</java:condition>
          <java:consequence>              
!               m.log("BP 3 getting called");
                m.addWarning("BP","no BP has been recorded");
          </java:consequence>
***************
*** 192,196 ****
          <java:condition>m.getLastDateRecordedInMonths("BMED") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("BMED 1 getting called");
                m.addRecommendation("BMED","BP Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("BMED")+" months");
          </java:consequence>
--- 192,196 ----
          <java:condition>m.getLastDateRecordedInMonths("BMED") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("BMED 1 getting called");
                m.addRecommendation("BMED","BP Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("BMED")+" months");
          </java:consequence>
***************
*** 203,207 ****
          <java:condition>m.getLastDateRecordedInMonths("BMED") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("BMED 2 getting called");
                m.addWarning("BMED","BP Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("BMED")+" months");
          </java:consequence>
--- 203,207 ----
          <java:condition>m.getLastDateRecordedInMonths("BMED") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("BMED 2 getting called");
                m.addWarning("BMED","BP Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("BMED")+" months");
          </java:consequence>
***************
*** 214,218 ****
          <java:condition>m.getLastDateRecordedInMonths("BMED") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("BMED 3 getting called");
                m.addWarning("BMED","no BP Meds changes have been recorded");
          </java:consequence>
--- 214,218 ----
          <java:condition>m.getLastDateRecordedInMonths("BMED") ==  -1</java:condition>
          <java:consequence>              
!               m.log("BMED 3 getting called");
                m.addWarning("BMED","no BP Meds changes have been recorded");
          </java:consequence>
***************
*** 228,232 ****
          <java:condition>m.getLastDateRecordedInMonths("BMI") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("BMI 1 getting called");
                m.addRecommendation("BMI","BMI hasn't been recorded in "+m.getLastDateRecordedInMonths("BMI")+" months");
          </java:consequence>
--- 228,232 ----
          <java:condition>m.getLastDateRecordedInMonths("BMI") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("BMI 1 getting called");
                m.addRecommendation("BMI","BMI hasn't been recorded in "+m.getLastDateRecordedInMonths("BMI")+" months");
          </java:consequence>
***************
*** 239,243 ****
          <java:condition>m.getLastDateRecordedInMonths("BMI") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("BMI 2 getting called");
                m.addWarning("BMI","BMI hasn't been recorded in "+m.getLastDateRecordedInMonths("BMI")+" months");
          </java:consequence>
--- 239,243 ----
          <java:condition>m.getLastDateRecordedInMonths("BMI") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("BMI 2 getting called");
                m.addWarning("BMI","BMI hasn't been recorded in "+m.getLastDateRecordedInMonths("BMI")+" months");
          </java:consequence>
***************
*** 250,254 ****
          <java:condition>m.getLastDateRecordedInMonths("BMI") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("BMI 3 getting called");
                m.addWarning("BMI","no BMI has been recorded");
          </java:consequence>
--- 250,254 ----
          <java:condition>m.getLastDateRecordedInMonths("BMI") ==  -1</java:condition>
          <java:consequence>              
!               m.log("BMI 3 getting called");
                m.addWarning("BMI","no BMI has been recorded");
          </java:consequence>
***************
*** 264,268 ****
          <java:condition>m.getLastDateRecordedInMonths("DIER") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("DIER 1 getting called");
                m.addRecommendation("DIER","Diet/Exercise hasn't been recorded in "+m.getLastDateRecordedInMonths("DIER")+" months");
          </java:consequence>
--- 264,268 ----
          <java:condition>m.getLastDateRecordedInMonths("DIER") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("DIER 1 getting called");
                m.addRecommendation("DIER","Diet/Exercise hasn't been recorded in "+m.getLastDateRecordedInMonths("DIER")+" months");
          </java:consequence>
***************
*** 275,279 ****
          <java:condition>m.getLastDateRecordedInMonths("DIER") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("DIER 2 getting called");
                m.addWarning("DIER","Diet/ Exercise hasn't been recorded in "+m.getLastDateRecordedInMonths("DIER")+" months");
          </java:consequence>
--- 275,279 ----
          <java:condition>m.getLastDateRecordedInMonths("DIER") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("DIER 2 getting called");
                m.addWarning("DIER","Diet/ Exercise hasn't been recorded in "+m.getLastDateRecordedInMonths("DIER")+" months");
          </java:consequence>
***************
*** 286,290 ****
          <java:condition>m.getLastDateRecordedInMonths("DIER") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("DIER 3 getting called");
                m.addWarning("DIER","Diet/Excercise has not been recorded");
          </java:consequence>
--- 286,290 ----
          <java:condition>m.getLastDateRecordedInMonths("DIER") ==  -1</java:condition>
          <java:consequence>              
!               m.log("DIER 3 getting called");
                m.addWarning("DIER","Diet/Excercise has not been recorded");
          </java:consequence>
***************
*** 301,305 ****
          <java:condition>m.getLastValueAsInt("NOSK") != 0</java:condition>
          <java:consequence>              
!               System.out.println("NOSK 1 getting called");
                m.addRecommendation("NOSK","Number of Cigarettes hasn't been recorded in "+m.getLastDateRecordedInMonths("NOSK")+" months");
          </java:consequence>
--- 301,305 ----
          <java:condition>m.getLastValueAsInt("NOSK") != 0</java:condition>
          <java:consequence>              
!               m.log("NOSK 1 getting called");
                m.addRecommendation("NOSK","Number of Cigarettes hasn't been recorded in "+m.getLastDateRecordedInMonths("NOSK")+" months");
          </java:consequence>
***************
*** 313,317 ****
          <java:condition>m.getLastValueAsInt("NOSK") != 0</java:condition>
          <java:consequence>              
!               System.out.println("NOSK 2 getting called");
                m.addWarning("NOSK","Number of Cigarettes hasn't been recorded in "+m.getLastDateRecordedInMonths("NOSK")+" months");
          </java:consequence>
--- 313,317 ----
          <java:condition>m.getLastValueAsInt("NOSK") != 0</java:condition>
          <java:consequence>              
!               m.log("NOSK 2 getting called");
                m.addWarning("NOSK","Number of Cigarettes hasn't been recorded in "+m.getLastDateRecordedInMonths("NOSK")+" months");
          </java:consequence>
***************
*** 324,328 ****
          <java:condition>m.getLastDateRecordedInMonths("NOSK") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("NOSK 3 getting called");
                m.addWarning("NOSK","Number of Cigarrettes has never been recorded, if non smoker enter zero");
          </java:consequence>
--- 324,328 ----
          <java:condition>m.getLastDateRecordedInMonths("NOSK") ==  -1</java:condition>
          <java:consequence>              
!               m.log("NOSK 3 getting called");
                m.addWarning("NOSK","Number of Cigarrettes has never been recorded, if non smoker enter zero");
          </java:consequence>
***************
*** 339,343 ****
          <java:condition>m.getLastDateRecordedInMonths("LDL") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("LDL 1 getting called");
                m.addRecommendation("LDL","LDL hasn't been recorded in "+m.getLastDateRecordedInMonths("LDL")+" months");
          </java:consequence>
--- 339,343 ----
          <java:condition>m.getLastDateRecordedInMonths("LDL") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("LDL 1 getting called");
                m.addRecommendation("LDL","LDL hasn't been recorded in "+m.getLastDateRecordedInMonths("LDL")+" months");
          </java:consequence>
***************
*** 350,354 ****
          <java:condition>m.getLastDateRecordedInMonths("LDL") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("LDL 2 getting called");
                m.addWarning("LDL","LDL hasn't been recorded in "+m.getLastDateRecordedInMonths("LDL")+" months");
          </java:consequence>
--- 350,354 ----
          <java:condition>m.getLastDateRecordedInMonths("LDL") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("LDL 2 getting called");
                m.addWarning("LDL","LDL hasn't been recorded in "+m.getLastDateRecordedInMonths("LDL")+" months");
          </java:consequence>
***************
*** 361,365 ****
          <java:condition>m.getLastDateRecordedInMonths("LDL") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("LDL 3 getting called");
                m.addWarning("LDL","LDL has not been recorded");
          </java:consequence>
--- 361,365 ----
          <java:condition>m.getLastDateRecordedInMonths("LDL") ==  -1</java:condition>
          <java:consequence>              
!               m.log("LDL 3 getting called");
                m.addWarning("LDL","LDL has not been recorded");
          </java:consequence>
***************
*** 377,381 ****
          <java:condition>m.getLastDateRecordedInMonths("TCHD") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("TCHD 1 getting called");
                m.addRecommendation("TCHD","TC/HDL hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHD")+" months");
          </java:consequence>
--- 377,381 ----
          <java:condition>m.getLastDateRecordedInMonths("TCHD") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("TCHD 1 getting called");
                m.addRecommendation("TCHD","TC/HDL hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHD")+" months");
          </java:consequence>
***************
*** 388,392 ****
          <java:condition>m.getLastDateRecordedInMonths("TCHD") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("TCHD 2 getting called");
                m.addWarning("TCHD","TC/HDL hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHD")+" months");
          </java:consequence>
--- 388,392 ----
          <java:condition>m.getLastDateRecordedInMonths("TCHD") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("TCHD 2 getting called");
                m.addWarning("TCHD","TC/HDL hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHD")+" months");
          </java:consequence>
***************
*** 399,403 ****
          <java:condition>m.getLastDateRecordedInMonths("TCHD") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("TCHD 3 getting called");
                m.addWarning("TCHD","TC/HDL has not been recorded");
          </java:consequence>
--- 399,403 ----
          <java:condition>m.getLastDateRecordedInMonths("TCHD") ==  -1</java:condition>
          <java:consequence>              
!               m.log("TCHD 3 getting called");
                m.addWarning("TCHD","TC/HDL has not been recorded");
          </java:consequence>
***************
*** 415,419 ****
          <java:condition>m.getLastDateRecordedInMonths("TG") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("TG 1 getting called");
                m.addRecommendation("TG","Triglycerides hasn't been recorded in "+m.getLastDateRecordedInMonths("TG")+" months");
          </java:consequence>
--- 415,419 ----
          <java:condition>m.getLastDateRecordedInMonths("TG") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("TG 1 getting called");
                m.addRecommendation("TG","Triglycerides hasn't been recorded in "+m.getLastDateRecordedInMonths("TG")+" months");
          </java:consequence>
***************
*** 426,430 ****
          <java:condition>m.getLastDateRecordedInMonths("TG") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("TG 2 getting called");
                m.addWarning("TG","Triglycerides hasn't been recorded in "+m.getLastDateRecordedInMonths("TG")+" months");
          </java:consequence>
--- 426,430 ----
          <java:condition>m.getLastDateRecordedInMonths("TG") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("TG 2 getting called");
                m.addWarning("TG","Triglycerides hasn't been recorded in "+m.getLastDateRecordedInMonths("TG")+" months");
          </java:consequence>
***************
*** 437,441 ****
          <java:condition>m.getLastDateRecordedInMonths("TG") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("TG 3 getting called");
                m.addWarning("TG","Triglycerides has not been recorded");
          </java:consequence>
--- 437,441 ----
          <java:condition>m.getLastDateRecordedInMonths("TG") ==  -1</java:condition>
          <java:consequence>              
!               m.log("TG 3 getting called");
                m.addWarning("TG","Triglycerides has not been recorded");
          </java:consequence>
***************
*** 452,456 ****
          <java:condition>m.getLastDateRecordedInMonths("LMED") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("LMED 1 getting called");
                m.addRecommendation("LMED","Lipid Lowering Meds hasn't been recorded in  "+m.getLastDateRecordedInMonths("LMED")+" months");
          </java:consequence>
--- 452,456 ----
          <java:condition>m.getLastDateRecordedInMonths("LMED") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("LMED 1 getting called");
                m.addRecommendation("LMED","Lipid Lowering Meds hasn't been recorded in  "+m.getLastDateRecordedInMonths("LMED")+" months");
          </java:consequence>
***************
*** 463,467 ****
          <java:condition>m.getLastDateRecordedInMonths("LMED") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("LMED 2 getting called");
                m.addWarning("LMED","Lipid Lowering Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("LMED")+" months");
          </java:consequence>
--- 463,467 ----
          <java:condition>m.getLastDateRecordedInMonths("LMED") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("LMED 2 getting called");
                m.addWarning("LMED","Lipid Lowering Meds hasn't been recorded in "+m.getLastDateRecordedInMonths("LMED")+" months");
          </java:consequence>
***************
*** 474,478 ****
          <java:condition>m.getLastDateRecordedInMonths("LMED") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("LMED 3 getting called");
                m.addWarning("LMED","Lipid Lowering Meds has not been recorded");
          </java:consequence>
--- 474,478 ----
          <java:condition>m.getLastDateRecordedInMonths("LMED") ==  -1</java:condition>
          <java:consequence>              
!               m.log("LMED 3 getting called");
                m.addWarning("LMED","Lipid Lowering Meds has not been recorded");
          </java:consequence>
***************
*** 488,492 ****
          <java:condition>m.getLastDateRecordedInMonths("FGLC") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("FGLC 1 getting called");
                m.addRecommendation("FGLC","Fasting glucose meter/lab comparison hasn't been recorded in  "+m.getLastDateRecordedInMonths("FGLC")+" months");
          </java:consequence>
--- 488,492 ----
          <java:condition>m.getLastDateRecordedInMonths("FGLC") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("FGLC 1 getting called");
                m.addRecommendation("FGLC","Fasting glucose meter/lab comparison hasn't been recorded in  "+m.getLastDateRecordedInMonths("FGLC")+" months");
          </java:consequence>
***************
*** 499,503 ****
          <java:condition>m.getLastDateRecordedInMonths("FGLC") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("FGLC 2 getting called");
                m.addWarning("FGLC","Fasting glucose meter/lab comparison hasn't been recorded in  "+m.getLastDateRecordedInMonths("FGLC")+" months");
          </java:consequence>
--- 499,503 ----
          <java:condition>m.getLastDateRecordedInMonths("FGLC") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("FGLC 2 getting called");
                m.addWarning("FGLC","Fasting glucose meter/lab comparison hasn't been recorded in  "+m.getLastDateRecordedInMonths("FGLC")+" months");
          </java:consequence>
***************
*** 510,514 ****
          <java:condition>m.getLastDateRecordedInMonths("FGLC") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("FGLC 3 getting called");
                m.addWarning("FGLC","Fasting glucose meter/lab comparison has not been recorded");
          </java:consequence>
--- 510,514 ----
          <java:condition>m.getLastDateRecordedInMonths("FGLC") ==  -1</java:condition>
          <java:consequence>              
!               m.log("FGLC 3 getting called");
                m.addWarning("FGLC","Fasting glucose meter/lab comparison has not been recorded");
          </java:consequence>
***************
*** 524,528 ****
          <java:condition>m.getLastDateRecordedInMonths("EYEE") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("EYEE 1 getting called");
                m.addRecommendation("EYEE","An Opthalmologist/ Optometrist exam hasn't been recorded in  "+m.getLastDateRecordedInMonths("EYEE")+" months");
          </java:consequence>
--- 524,528 ----
          <java:condition>m.getLastDateRecordedInMonths("EYEE") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("EYEE 1 getting called");
                m.addRecommendation("EYEE","An Opthalmologist/ Optometrist exam hasn't been recorded in  "+m.getLastDateRecordedInMonths("EYEE")+" months");
          </java:consequence>
***************
*** 535,539 ****
          <java:condition>m.getLastDateRecordedInMonths("EYEE") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("EYEE 2 getting called");
                m.addWarning("EYEE","An Opthalmologist/ Optometrist exam hasn't been recorded in  "+m.getLastDateRecordedInMonths("EYEE")+" months");
          </java:consequence>
--- 535,539 ----
          <java:condition>m.getLastDateRecordedInMonths("EYEE") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("EYEE 2 getting called");
                m.addWarning("EYEE","An Opthalmologist/ Optometrist exam hasn't been recorded in  "+m.getLastDateRecordedInMonths("EYEE")+" months");
          </java:consequence>
***************
*** 546,550 ****
          <java:condition>m.getLastDateRecordedInMonths("EYEE") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("EYEE 3 getting called");
                m.addWarning("EYEE","An Opthalmologist/ Optometrist exam has not been recorded");
          </java:consequence>
--- 546,550 ----
          <java:condition>m.getLastDateRecordedInMonths("EYEE") ==  -1</java:condition>
          <java:consequence>              
!               m.log("EYEE 3 getting called");
                m.addWarning("EYEE","An Opthalmologist/ Optometrist exam has not been recorded");
          </java:consequence>
***************
*** 560,564 ****
          <java:condition>m.getLastDateRecordedInMonths("ACR") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("ACR 1 getting called");
                m.addRecommendation("ACR","An Alb: creat ratio value hasn't been recorded in "+m.getLastDateRecordedInMonths("ACR")+" months");
          </java:consequence>
--- 560,564 ----
          <java:condition>m.getLastDateRecordedInMonths("ACR") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("ACR 1 getting called");
                m.addRecommendation("ACR","An Alb: creat ratio value hasn't been recorded in "+m.getLastDateRecordedInMonths("ACR")+" months");
          </java:consequence>
***************
*** 571,575 ****
          <java:condition>m.getLastDateRecordedInMonths("ACR") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("ACR 2 getting called");
                m.addWarning("ACR","An Alb: creat ratio value hasn't been recorded in "+m.getLastDateRecordedInMonths("ACR")+" months");
          </java:consequence>
--- 571,575 ----
          <java:condition>m.getLastDateRecordedInMonths("ACR") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("ACR 2 getting called");
                m.addWarning("ACR","An Alb: creat ratio value hasn't been recorded in "+m.getLastDateRecordedInMonths("ACR")+" months");
          </java:consequence>
***************
*** 582,586 ****
          <java:condition>m.getLastDateRecordedInMonths("ACR") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("ACR 3 getting called");
                m.addWarning("ACR","An Alb: creat ratio value has not been recorded");
          </java:consequence>
--- 582,586 ----
          <java:condition>m.getLastDateRecordedInMonths("ACR") ==  -1</java:condition>
          <java:consequence>              
!               m.log("ACR 3 getting called");
                m.addWarning("ACR","An Alb: creat ratio value has not been recorded");
          </java:consequence>
***************
*** 596,600 ****
          <java:condition>m.getLastDateRecordedInMonths("EGFR") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("EGFR 1 getting called");
                m.addRecommendation("EGFR","An eGFR value hasn't been recorded in "+m.getLastDateRecordedInMonths("EGFR")+" months");
          </java:consequence>
--- 596,600 ----
          <java:condition>m.getLastDateRecordedInMonths("EGFR") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("EGFR 1 getting called");
                m.addRecommendation("EGFR","An eGFR value hasn't been recorded in "+m.getLastDateRecordedInMonths("EGFR")+" months");
          </java:consequence>
***************
*** 607,611 ****
          <java:condition>m.getLastDateRecordedInMonths("EGFR") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("EGFR 2 getting called");
                m.addWarning("EGFR","An eGFR value hasn't been recorded in "+m.getLastDateRecordedInMonths("EGFR")+" months");
          </java:consequence>
--- 607,611 ----
          <java:condition>m.getLastDateRecordedInMonths("EGFR") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("EGFR 2 getting called");
                m.addWarning("EGFR","An eGFR value hasn't been recorded in "+m.getLastDateRecordedInMonths("EGFR")+" months");
          </java:consequence>
***************
*** 618,622 ****
          <java:condition>m.getLastDateRecordedInMonths("EGFR") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("EGFR 3 getting called");
                m.addWarning("EGFR","An eGFR value has not been recorded");
          </java:consequence>
--- 618,622 ----
          <java:condition>m.getLastDateRecordedInMonths("EGFR") ==  -1</java:condition>
          <java:consequence>              
!               m.log("EGFR 3 getting called");
                m.addWarning("EGFR","An eGFR value has not been recorded");
          </java:consequence>
***************
*** 633,637 ****
          <java:condition>m.getLastDateRecordedInMonths("FTE") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("FTE 1 getting called");
                m.addRecommendation("FTE","A Lower Extremity Exam hasn't been recorded in "+m.getLastDateRecordedInMonths("FTE")+" months");
          </java:consequence>
--- 633,637 ----
          <java:condition>m.getLastDateRecordedInMonths("FTE") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("FTE 1 getting called");
                m.addRecommendation("FTE","A Lower Extremity Exam hasn't been recorded in "+m.getLastDateRecordedInMonths("FTE")+" months");
          </java:consequence>
***************
*** 644,648 ****
          <java:condition>m.getLastDateRecordedInMonths("FTE") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("FTE 2 getting called");
                m.addWarning("FTE","A Lower Extremity Exam hasn't been recorded in "+m.getLastDateRecordedInMonths("FTE")+" months");
          </java:consequence>
--- 644,648 ----
          <java:condition>m.getLastDateRecordedInMonths("FTE") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("FTE 2 getting called");
                m.addWarning("FTE","A Lower Extremity Exam hasn't been recorded in "+m.getLastDateRecordedInMonths("FTE")+" months");
          </java:consequence>
***************
*** 655,659 ****
          <java:condition>m.getLastDateRecordedInMonths("FTE") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("FTE 3 getting called");
                m.addWarning("FTE","A Lower Extremity Exam has not been recorded");
          </java:consequence>
--- 655,659 ----
          <java:condition>m.getLastDateRecordedInMonths("FTE") ==  -1</java:condition>
          <java:consequence>              
!               m.log("FTE 3 getting called");
                m.addWarning("FTE","A Lower Extremity Exam has not been recorded");
          </java:consequence>
***************
*** 670,674 ****
          <java:condition>m.getLastDateRecordedInMonths("FTLS") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("FTLS 1 getting called");
                m.addRecommendation("FTLS","A loss of sensation test hasn't been recorded in "+m.getLastDateRecordedInMonths("FTLS")+" months");
          </java:consequence>
--- 670,674 ----
          <java:condition>m.getLastDateRecordedInMonths("FTLS") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("FTLS 1 getting called");
                m.addRecommendation("FTLS","A loss of sensation test hasn't been recorded in "+m.getLastDateRecordedInMonths("FTLS")+" months");
          </java:consequence>
***************
*** 681,685 ****
          <java:condition>m.getLastDateRecordedInMonths("FTLS") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("FTLS 2 getting called");
                m.addWarning("FTLS","A loss of sensation test hasn't been recorded in "+m.getLastDateRecordedInMonths("FTLS")+" months");
          </java:consequence>
--- 681,685 ----
          <java:condition>m.getLastDateRecordedInMonths("FTLS") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("FTLS 2 getting called");
                m.addWarning("FTLS","A loss of sensation test hasn't been recorded in "+m.getLastDateRecordedInMonths("FTLS")+" months");
          </java:consequence>
***************
*** 692,696 ****
          <java:condition>m.getLastDateRecordedInMonths("FTLS") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("FTLS 3 getting called");
                m.addWarning("FTLS","A loss of sensation test has not been recorded");
          </java:consequence>
--- 692,696 ----
          <java:condition>m.getLastDateRecordedInMonths("FTLS") ==  -1</java:condition>
          <java:consequence>              
!               m.log("FTLS 3 getting called");
                m.addWarning("FTLS","A loss of sensation test has not been recorded");
          </java:consequence>
***************
*** 707,711 ****
          <java:condition>m.getLastDateRecordedInMonths("PANE") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("PANE 1 getting called");
                m.addRecommendation("PANE","A value for Painful Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("PANE")+" months");
          </java:consequence>
--- 707,711 ----
          <java:condition>m.getLastDateRecordedInMonths("PANE") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("PANE 1 getting called");
                m.addRecommendation("PANE","A value for Painful Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("PANE")+" months");
          </java:consequence>
***************
*** 718,722 ****
          <java:condition>m.getLastDateRecordedInMonths("PANE") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("PANE 2 getting called");
                m.addWarning("PANE","A value for Painful Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("PANE")+" months");
          </java:consequence>
--- 718,722 ----
          <java:condition>m.getLastDateRecordedInMonths("PANE") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("PANE 2 getting called");
                m.addWarning("PANE","A value for Painful Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("PANE")+" months");
          </java:consequence>
***************
*** 729,733 ****
          <java:condition>m.getLastDateRecordedInMonths("PANE") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("PANE 3 getting called");
                m.addWarning("PANE","A value for Painful Neuropathy has not been recorded");
          </java:consequence>
--- 729,733 ----
          <java:condition>m.getLastDateRecordedInMonths("PANE") ==  -1</java:condition>
          <java:consequence>              
!               m.log("PANE 3 getting called");
                m.addWarning("PANE","A value for Painful Neuropathy has not been recorded");
          </java:consequence>
***************
*** 743,747 ****
          <java:condition>m.getLastDateRecordedInMonths("EDGI") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("EDGI 1 getting called");
                m.addRecommendation("EDGI","A value for Autonomic Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("EDGI")+" months");
          </java:consequence>
--- 743,747 ----
          <java:condition>m.getLastDateRecordedInMonths("EDGI") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("EDGI 1 getting called");
                m.addRecommendation("EDGI","A value for Autonomic Neuropathy hasn't been recorded in "+m.getLastDateRecordedInMonths("EDGI")+" months");
          </java:consequence>
***************
*** 754,758 ****
          <java:condition>m.getLastDateRecordedInMonths("EDGI") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("EDGI 2 getting called");
                m.addWarning("EDGI","A value for Autonomic Neuropathy hasn't been recorded in  "+m.getLastDateRecordedInMonths("EDGI")+" months");
          </java:consequence>
--- 754,758 ----
          <java:condition>m.getLastDateRecordedInMonths("EDGI") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("EDGI 2 getting called");
                m.addWarning("EDGI","A value for Autonomic Neuropathy hasn't been recorded in  "+m.getLastDateRecordedInMonths("EDGI")+" months");
          </java:consequence>
***************
*** 765,769 ****
          <java:condition>m.getLastDateRecordedInMonths("EDGI") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("EDGI 3 getting called");
                m.addWarning("EDGI","A value for Autonomic Neuropathy has not been recorded");
          </java:consequence>
--- 765,769 ----
          <java:condition>m.getLastDateRecordedInMonths("EDGI") ==  -1</java:condition>
          <java:consequence>              
!               m.log("EDGI 3 getting called");
                m.addWarning("EDGI","A value for Autonomic Neuropathy has not been recorded");
          </java:consequence>
***************
*** 781,785 ****
          <java:condition>m.getLastDateRecordedInMonths("DMME") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("DMME 1 getting called");
                m.addRecommendation("DMME","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMME")+" months");
          </java:consequence>
--- 781,785 ----
          <java:condition>m.getLastDateRecordedInMonths("DMME") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("DMME 1 getting called");
                m.addRecommendation("DMME","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMME")+" months");
          </java:consequence>
***************
*** 792,796 ****
          <java:condition>m.getLastDateRecordedInMonths("DMME") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("DMME 2 getting called");
                m.addWarning("DMME","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMME")+" months");
          </java:consequence>
--- 792,796 ----
          <java:condition>m.getLastDateRecordedInMonths("DMME") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("DMME 2 getting called");
                m.addWarning("DMME","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMME")+" months");
          </java:consequence>
***************
*** 803,807 ****
          <java:condition>m.getLastDateRecordedInMonths("DMME") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("DMME 3 getting called");
                m.addWarning("DMME","A value for Diabetes Education has not been recorded");
          </java:consequence>
--- 803,807 ----
          <java:condition>m.getLastDateRecordedInMonths("DMME") ==  -1</java:condition>
          <java:consequence>              
!               m.log("DMME 3 getting called");
                m.addWarning("DMME","A value for Diabetes Education has not been recorded");
          </java:consequence>
***************
*** 816,820 ****
          <java:condition>m.getLastDateRecordedInMonths("DMSM") &lt; 12</java:condition>
          <java:consequence>              
!               System.out.println("DMSM 1 getting called");
                m.addRecommendation("DMSM","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMSM")+" months");
          </java:consequence>
--- 816,820 ----
          <java:condition>m.getLastDateRecordedInMonths("DMSM") &lt; 12</java:condition>
          <java:consequence>              
!               m.log("DMSM 1 getting called");
                m.addRecommendation("DMSM","A value for Diabetes Education hasn't been recorded in "+m.getLastDateRecordedInMonths("DMSM")+" months");
          </java:consequence>
***************
*** 827,831 ****
          <java:condition>m.getLastDateRecordedInMonths("DMSM") &gt;= 12</java:condition>        
          <java:consequence>              
!               System.out.println("DMSM 2 getting called");
                m.addWarning("DMSM","A value for Diabetes Self Management Goals hasn't been recorded in "+m.getLastDateRecordedInMonths("DMSM")+" months");
          </java:consequence>
--- 827,831 ----
          <java:condition>m.getLastDateRecordedInMonths("DMSM") &gt;= 12</java:condition>        
          <java:consequence>              
!               m.log("DMSM 2 getting called");
                m.addWarning("DMSM","A value for Diabetes Self Management Goals hasn't been recorded in "+m.getLastDateRecordedInMonths("DMSM")+" months");
          </java:consequence>
***************
*** 838,842 ****
          <java:condition>m.getLastDateRecordedInMonths("DMSM") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("DMSM 3 getting called");
                m.addWarning("DMSM","A value for Diabetes Self Management Goals has not been recorded");
          </java:consequence>
--- 838,842 ----
          <java:condition>m.getLastDateRecordedInMonths("DMSM") ==  -1</java:condition>
          <java:consequence>              
!               m.log("DMSM 3 getting called");
                m.addWarning("DMSM","A value for Diabetes Self Management Goals has not been recorded");
          </java:consequence>

Index: hiv.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/hiv.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hiv.drl	6 Jul 2007 19:16:49 -0000	1.2
--- hiv.drl	17 Nov 2010 16:43:22 -0000	1.3
***************
*** 50,54 ****
          <java:condition>m.getLastDateRecordedInMonths("CD4") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("CD4 1 getting called");
                m.addRecommendation("CD4","CD4 hasn't been reviewed in "+m.getLastDateRecordedInMonths("CD4")+" months");
          </java:consequence>
--- 50,54 ----
          <java:condition>m.getLastDateRecordedInMonths("CD4") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("CD4 1 getting called");
                m.addRecommendation("CD4","CD4 hasn't been reviewed in "+m.getLastDateRecordedInMonths("CD4")+" months");
          </java:consequence>
***************
*** 61,65 ****
          <java:condition>m.getLastDateRecordedInMonths("CD4") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("CD4 2 getting called");
                m.addWarning("CD4","CD4 hasn't been reviewed in "+m.getLastDateRecordedInMonths("CD4")+" months");
          </java:consequence>
--- 61,65 ----
          <java:condition>m.getLastDateRecordedInMonths("CD4") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("CD4 2 getting called");
                m.addWarning("CD4","CD4 hasn't been reviewed in "+m.getLastDateRecordedInMonths("CD4")+" months");
          </java:consequence>
***************
*** 72,76 ****
          <java:condition>m.getLastDateRecordedInMonths("CD4") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("CD4 3 getting called");
                m.addWarning("CD4","CD4 hasn't been reviewed");
          </java:consequence>
--- 72,76 ----
          <java:condition>m.getLastDateRecordedInMonths("CD4") ==  -1</java:condition>
          <java:consequence>              
!               m.log("CD4 3 getting called");
                m.addWarning("CD4","CD4 hasn't been reviewed");
          </java:consequence>
***************
*** 85,89 ****
          <java:condition>m.getLastDateRecordedInMonths("VLOA") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("VLOA 1 getting called");
                m.addRecommendation("VLOA","A Viral Load hasn't been recorded in "+m.getLastDateRecordedInMonths("VLOA")+" months");
          </java:consequence>
--- 85,89 ----
          <java:condition>m.getLastDateRecordedInMonths("VLOA") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("VLOA 1 getting called");
                m.addRecommendation("VLOA","A Viral Load hasn't been recorded in "+m.getLastDateRecordedInMonths("VLOA")+" months");
          </java:consequence>
***************
*** 96,100 ****
          <java:condition>m.getLastDateRecordedInMonths("VLOA") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("VLOA 2 getting called");
                m.addWarning("VLOA","A Viral Load hasn't been recorded in "+m.getLastDateRecordedInMonths("VLOA")+" months");
          </java:consequence>
--- 96,100 ----
          <java:condition>m.getLastDateRecordedInMonths("VLOA") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("VLOA 2 getting called");
                m.addWarning("VLOA","A Viral Load hasn't been recorded in "+m.getLastDateRecordedInMonths("VLOA")+" months");
          </java:consequence>
***************
*** 107,111 ****
          <java:condition>m.getLastDateRecordedInMonths("VLOA") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("VLOA 3 getting called");
                m.addWarning("VLOA","no Viral Load values has been recorded");
          </java:consequence>
--- 107,111 ----
          <java:condition>m.getLastDateRecordedInMonths("VLOA") ==  -1</java:condition>
          <java:consequence>              
!               m.log("VLOA 3 getting called");
                m.addWarning("VLOA","no Viral Load values has been recorded");
          </java:consequence>
***************
*** 119,123 ****
          <java:condition>m.getLastDateRecordedInMonths("Hb") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("Hb 1 getting called");
                m.addRecommendation("Hb","Hb changes haven't been recorded in "+m.getLastDateRecordedInMonths("Hb")+" months");
          </java:consequence>
--- 119,123 ----
          <java:condition>m.getLastDateRecordedInMonths("Hb") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("Hb 1 getting called");
                m.addRecommendation("Hb","Hb changes haven't been recorded in "+m.getLastDateRecordedInMonths("Hb")+" months");
          </java:consequence>
***************
*** 130,134 ****
          <java:condition>m.getLastDateRecordedInMonths("Hb") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("Hb 2 getting called");
                m.addWarning("Hb","Hb changes haven't been recorded in "+m.getLastDateRecordedInMonths("Hb")+" months");
          </java:consequence>
--- 130,134 ----
          <java:condition>m.getLastDateRecordedInMonths("Hb") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("Hb 2 getting called");
                m.addWarning("Hb","Hb changes haven't been recorded in "+m.getLastDateRecordedInMonths("Hb")+" months");
          </java:consequence>
***************
*** 141,145 ****
          <java:condition>m.getLastDateRecordedInMonths("Hb") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("Hb 3 getting called");
                m.addWarning("Hb","no Hb changes have been recorded");
          </java:consequence>
--- 141,145 ----
          <java:condition>m.getLastDateRecordedInMonths("Hb") ==  -1</java:condition>
          <java:consequence>              
!               m.log("Hb 3 getting called");
                m.addWarning("Hb","no Hb changes have been recorded");
          </java:consequence>
***************
*** 153,157 ****
          <java:condition>m.getLastDateRecordedInMonths("ALT") &lt; 6</java:condition>
          <java:consequence>              
!               System.out.println("ALT 1 getting called");
                m.addRecommendation("ALT","ALT hasn't been recorded in "+m.getLastDateRecordedInMonths("ALT")+" months");
          </java:consequence>
--- 153,157 ----
          <java:condition>m.getLastDateRecordedInMonths("ALT") &lt; 6</java:condition>
          <java:consequence>              
!               m.log("ALT 1 getting called");
                m.addRecommendation("ALT","ALT hasn't been recorded in "+m.getLastDateRecordedInMonths("ALT")+" months");
          </java:consequence>
***************
*** 164,168 ****
          <java:condition>m.getLastDateRecordedInMonths("ALT") &gt;= 6</java:condition>        
          <java:consequence>              
!               System.out.println("ALT 2 getting called");
                m.addWarning("ALT","ALT hasn't been recorded in "+m.getLastDateRecordedInMonths("ALT")+" months");
          </java:consequence>
--- 164,168 ----
          <java:condition>m.getLastDateRecordedInMonths("ALT") &gt;= 6</java:condition>        
          <java:consequence>              
!               m.log("ALT 2 getting called");
                m.addWarning("ALT","ALT hasn't been recorded in "+m.getLastDateRecordedInMonths("ALT")+" months");
          </java:consequence>
***************
*** 175,179 ****
          <java:condition>m.getLastDateRecordedInMonths("ALT") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("ALT 3 getting called");
                m.addWarning("ALT","no ALT has been recorded");
          </java:consequence>
--- 175,179 ----
          <java:condition>m.getLastDateRecordedInMonths("ALT") ==  -1</java:condition>
          <java:consequence>              
!               m.log("ALT 3 getting called");
                m.addWarning("ALT","no ALT has been recorded");
          </java:consequence>
***************
*** 189,193 ****
  
          <java:consequence>              
!               System.out.println("FBS 1 getting called");
                m.addRecommendation("FBS","FBS hasn't been recorded in "+m.getLastDateRecordedInMonths("FBS")+" months");
          </java:consequence>
--- 189,193 ----
  
          <java:consequence>              
!               m.log("FBS 1 getting called");
                m.addRecommendation("FBS","FBS hasn't been recorded in "+m.getLastDateRecordedInMonths("FBS")+" months");
          </java:consequence>
***************
*** 200,204 ****
          <java:condition>m.getLastDateRecordedInMonths("FBS") &gt;= 9</java:condition>        
          <java:consequence>              
!               System.out.println("FBS 2 getting called");
                m.addWarning("FBS","FBS hasn't been recorded in "+m.getLastDateRecordedInMonths("FBS")+" months");
          </java:consequence>
--- 200,204 ----
          <java:condition>m.getLastDateRecordedInMonths("FBS") &gt;= 9</java:condition>        
          <java:consequence>              
!               m.log("FBS 2 getting called");
                m.addWarning("FBS","FBS hasn't been recorded in "+m.getLastDateRecordedInMonths("FBS")+" months");
          </java:consequence>
***************
*** 212,216 ****
          <java:condition>m.getLastDateRecordedInMonths("FBS") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("FBS 3 getting called");
                m.addWarning("FBS","no FBS has been recorded");
          </java:consequence>
--- 212,216 ----
          <java:condition>m.getLastDateRecordedInMonths("FBS") ==  -1</java:condition>
          <java:consequence>              
!               m.log("FBS 3 getting called");
                m.addWarning("FBS","no FBS has been recorded");
          </java:consequence>
***************
*** 228,232 ****
  
          <java:consequence>              
!               System.out.println("TCHL 1 getting called");
                m.addRecommendation("TCHL","Total Cholesterol hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHL")+" months");
          </java:consequence>
--- 228,232 ----
  
          <java:consequence>              
!               m.log("TCHL 1 getting called");
                m.addRecommendation("TCHL","Total Cholesterol hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHL")+" months");
          </java:consequence>
***************
*** 239,243 ****
          <java:condition>m.getLastDateRecordedInMonths("TCHL") &gt;= 9</java:condition>        
          <java:consequence>              
!               System.out.println("TCHL 2 getting called");
                m.addWarning("TCHL","Total Cholesterol hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHL")+" months");
          </java:consequence>
--- 239,243 ----
          <java:condition>m.getLastDateRecordedInMonths("TCHL") &gt;= 9</java:condition>        
          <java:consequence>              
!               m.log("TCHL 2 getting called");
                m.addWarning("TCHL","Total Cholesterol hasn't been recorded in "+m.getLastDateRecordedInMonths("TCHL")+" months");
          </java:consequence>
***************
*** 251,255 ****
          <java:condition>m.getLastDateRecordedInMonths("TCHL") ==  -1</java:condition>
          <java:consequence>              
!               System.out.println("TCHL 3 getting called");
                m.addWarning("TCHL","no Total Cholesterol has been recorded");
          </java:consequence>
--- 251,255 ----
          <java:condition>m.getLastDateRecordedInMonths("TCHL") ==  -1</java:condition>
          <java:consequence>              
!               m.log("TCHL 3 getting called");
                m.addWarning("TCHL","no Total Chol...
 
[truncated message content]

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport testCD4between200350.drl, 1.1, 1.2 testBPabove140_90.drl, 1.2, 1.3 diab-ACR.drl, 1.2, 1.3 diab-LDL.drl, 1.4, 1.5 diab-TG.drl, 1.2, 1.3 diab-EFGR.drl, 1.2, 1.3 testBPhigher130_80.drl, 1.2, 1.3 testA1Cabove7p9.drl, 1.4, 1.5 testTripleWhammy.drl, 1.6, 1.7 diab-C-yes-is-high.drl, 1.2, 1.3 testBPlower131.drl, 1.3, 1.4 diab-C-no-is-high.drl, 1.2, 1.3 testA1C.drl, 1.5, 1.6 testCD4lower200.drl, 1.1, 1.2 testBPlower130_80.drl, 1.1, 1.2 INR.drl, 1.1, 1.2 testLDLlower2p6.drl, 1.5, 1.6 diab-A1C.drl, 1.3, 1.4 testBPlower140_90.drl, 1.2, 1.3 testCD4high350.drl, 1.1, 1.2 testBPabove140_90_1.drl, 1.2, 1.3 diab-BMI.drl, 1.2, 1.3 diab-TCHDL.drl, 1.3, 1.4 testBPlower140_90_1.drl, 1.2, 1.3 testBPabove139.drl, 1.3, 1.4 diab-BP.drl, 1.2, 1.3

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22979

Modified Files:
	testCD4between200350.drl testBPabove140_90.drl diab-ACR.drl 
	diab-LDL.drl diab-TG.drl diab-EFGR.drl testBPhigher130_80.drl 
	testA1Cabove7p9.drl testTripleWhammy.drl 
	diab-C-yes-is-high.drl testBPlower131.drl 
	diab-C-no-is-high.drl testA1C.drl testCD4lower200.drl 
	testBPlower130_80.drl INR.drl testLDLlower2p6.drl diab-A1C.drl 
	testBPlower140_90.drl testCD4high350.drl 
	testBPabove140_90_1.drl diab-BMI.drl diab-TCHDL.drl 
	testBPlower140_90_1.drl testBPabove139.drl diab-BP.drl 
Log Message:
Removed System.out from drl files

Index: diab-C-yes-is-high.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-C-yes-is-high.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-C-yes-is-high.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-C-yes-is-high.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 14,18 ****
          <java:condition>m.isDataEqualTo("Yes")</java:condition>       
          <java:consequence>     
!               System.out.println("FGLC RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 14,18 ----
          <java:condition>m.isDataEqualTo("Yes")</java:condition>       
          <java:consequence>     
!               m.log("FGLC RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>

Index: testTripleWhammy.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testTripleWhammy.drl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testTripleWhammy.drl	25 Jul 2007 02:51:36 -0000	1.6
--- testTripleWhammy.drl	17 Nov 2010 16:35:04 -0000	1.7
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 2.0</java:condition>       
          <java:consequence>     
!               System.out.println("LDL RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 2.0</java:condition>       
          <java:consequence>     
!               m.log("LDL RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 28,32 ****
          <java:condition>m.setMeasurement("LDL") == false</java:condition>       
          <java:consequence>     
!               System.out.println("LDL_1 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(false);
          </java:consequence>
--- 28,32 ----
          <java:condition>m.setMeasurement("LDL") == false</java:condition>       
          <java:consequence>     
!               m.log("LDL_1 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(false);
          </java:consequence>
***************
*** 41,45 ****
          <java:condition>m.setMeasurement("BP") == false</java:condition>       
          <java:consequence>     
!               System.out.println("NO BP records");           
                m.setInRange(false);
          </java:consequence>
--- 41,45 ----
          <java:condition>m.setMeasurement("BP") == false</java:condition>       
          <java:consequence>     
!               m.log("NO BP records");
                m.setInRange(false);
          </java:consequence>
***************
*** 54,58 ****
          <java:condition>m.isInRange() == true</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 54,58 ----
          <java:condition>m.isInRange() == true</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 67,71 ****
          <java:condition>m.getNumberFromSplit("/",0) &gt;= 131</java:condition>   
          <java:consequence>     
!               System.out.println("BP2 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(false);
          </java:consequence>
--- 67,71 ----
          <java:condition>m.getNumberFromSplit("/",0) &gt;= 131</java:condition>   
          <java:consequence>     
!               m.log("BP2 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(false);
          </java:consequence>
***************
*** 82,86 ****
          <java:condition>m.setMeasurement("A1C") == false</java:condition>       
          <java:consequence>     
!               System.out.println("No A1C Records");           
                m.setInRange(false);
          </java:consequence>
--- 82,86 ----
          <java:condition>m.setMeasurement("A1C") == false</java:condition>       
          <java:consequence>     
!               m.log("No A1C Records");
                m.setInRange(false);
          </java:consequence>
***************
*** 97,101 ****
          <java:condition>m.isInRange() == true</java:condition>      
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 97,101 ----
          <java:condition>m.isInRange() == true</java:condition>      
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 109,113 ****
          <java:condition>m.getDataAsDouble() &gt;= 7.0</java:condition>              
          <java:consequence>     
!               System.out.println("A1C_1_2 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(false);
          </java:consequence>
--- 109,113 ----
          <java:condition>m.getDataAsDouble() &gt;= 7.0</java:condition>              
          <java:consequence>     
!               m.log("A1C_1_2 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(false);
          </java:consequence>
***************
*** 123,127 ****
          <java:condition>m.isInRange() == true</java:condition> 
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 123,127 ----
          <java:condition>m.isInRange() == true</java:condition> 
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 137,141 ****
          <java:condition>m.getDataAsDouble() &lt;= 2.0</java:condition>    
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(false);
          </java:consequence>
--- 137,141 ----
          <java:condition>m.getDataAsDouble() &lt;= 2.0</java:condition>    
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(false);
          </java:consequence>

Index: testBPabove140_90.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPabove140_90.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBPabove140_90.drl	7 Sep 2010 16:01:09 -0000	1.2
--- testBPabove140_90.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 19,23 ****
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 19,23 ----
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testBPlower140_90_1.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPlower140_90_1.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBPlower140_90_1.drl	7 Sep 2010 16:01:09 -0000	1.2
--- testBPlower140_90_1.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 19,23 ****
          <java:condition>m.getLastDateRecordedInMths() &lt; 7</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 19,23 ----
          <java:condition>m.getLastDateRecordedInMths() &lt; 7</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-C-no-is-high.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-C-no-is-high.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-C-no-is-high.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-C-no-is-high.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 14,18 ****
          <java:condition>m.isDataEqualTo("No")</java:condition>       
          <java:consequence>     
!               System.out.println("FGLC RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 14,18 ----
          <java:condition>m.isDataEqualTo("No")</java:condition>       
          <java:consequence>     
!               m.log("FGLC RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>

Index: testBPhigher130_80.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPhigher130_80.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBPhigher130_80.drl	7 Sep 2010 16:01:09 -0000	1.2
--- testBPhigher130_80.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 18,22 ****
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>
          <java:consequence>     
!               System.out.println("BPo130 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
--- 18,22 ----
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>
          <java:consequence>     
!               m.log("BPo130 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testCD4lower200.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testCD4lower200.drl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testCD4lower200.drl	3 Oct 2007 21:46:17 -0000	1.1
--- testCD4lower200.drl	17 Nov 2010 16:35:04 -0000	1.2
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 200</java:condition>       
          <java:consequence>     
!               System.out.println("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 200</java:condition>       
          <java:consequence>     
!               m.log("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-BP.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-BP.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-BP.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-BP.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 17,21 ****
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>       
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH 1");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>       
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN");
                m.setIndicationColor("HIGH 1");
          </java:consequence>
***************
*** 29,33 ****
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>       
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 29,33 ----
          <java:condition>m.getNumberFromSplit("/",1) &gt; 80</java:condition>       
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 41,45 ****
          <java:condition>m.getNumberFromSplit("/",1) &lt;= 80</java:condition>       
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 41,45 ----
          <java:condition>m.getNumberFromSplit("/",1) &lt;= 80</java:condition>       
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>

Index: diab-TG.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-TG.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-TG.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-TG.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 16,20 ****
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               System.out.println("TG RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 16,20 ----
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               m.log("TG RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>

Index: testCD4high350.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testCD4high350.drl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testCD4high350.drl	3 Oct 2007 21:46:17 -0000	1.1
--- testCD4high350.drl	17 Nov 2010 16:35:04 -0000	1.2
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &gt; 350</java:condition>       
          <java:consequence>     
!               System.out.println("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &gt; 350</java:condition>       
          <java:consequence>     
!               m.log("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: INR.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/INR.drl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** INR.drl	31 Oct 2008 14:22:49 -0000	1.1
--- INR.drl	17 Nov 2010 16:35:04 -0000	1.2
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 2</java:condition> 
          <java:consequence>     
!               System.out.println("INR RULES IS GETTING RUN");           
                m.setIndicationColor("LOW");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 2</java:condition> 
          <java:consequence>     
!               m.log("INR RULES IS GETTING RUN");
                m.setIndicationColor("LOW");
          </java:consequence>
***************
*** 29,33 ****
          <java:condition>m.getDataAsDouble() &lt; 5</java:condition> 
          <java:consequence>     
!               System.out.println("INR RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 29,33 ----
          <java:condition>m.getDataAsDouble() &lt; 5</java:condition> 
          <java:consequence>     
!               m.log("INR RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 40,44 ****
          <java:condition>m.getDataAsDouble() &gt;= 5</java:condition> 
          <java:consequence>     
!               System.out.println("INR RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH 1");
          </java:consequence>
--- 40,44 ----
          <java:condition>m.getDataAsDouble() &gt;= 5</java:condition> 
          <java:consequence>     
!               m.log("INR RULES IS GETTING RUN");
                m.setIndicationColor("HIGH 1");
          </java:consequence>

Index: testCD4between200350.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testCD4between200350.drl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testCD4between200350.drl	3 Oct 2007 21:46:17 -0000	1.1
--- testCD4between200350.drl	17 Nov 2010 16:35:04 -0000	1.2
***************
*** 18,22 ****
          <java:condition>m.getDataAsDouble() &lt;= 350</java:condition>     
          <java:consequence>     
!               System.out.println("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 18,22 ----
          <java:condition>m.getDataAsDouble() &lt;= 350</java:condition>     
          <java:consequence>     
!               m.log("CD4 RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testA1C.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testA1C.drl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testA1C.drl	6 Jul 2007 19:18:52 -0000	1.5
--- testA1C.drl	17 Nov 2010 16:35:04 -0000	1.6
***************
*** 18,22 ****
           <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition>      
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 18,22 ----
           <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition>      
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 31,35 ****
          <java:condition>m.getDataAsDouble() &lt; 0.07</java:condition>       
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 31,35 ----
          <java:condition>m.getDataAsDouble() &lt; 0.07</java:condition>       
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-EFGR.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-EFGR.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-EFGR.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-EFGR.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 16,20 ****
          <java:condition>m.getDataAsDouble() &lt;= 60</java:condition> 
          <java:consequence>     
!               System.out.println("ACR RULES IS GETTING RUN");           
                m.setIndicationColor("LOW");
          </java:consequence>
--- 16,20 ----
          <java:condition>m.getDataAsDouble() &lt;= 60</java:condition> 
          <java:consequence>     
!               m.log("ACR RULES IS GETTING RUN");
                m.setIndicationColor("LOW");
          </java:consequence>

Index: testBPlower140_90.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPlower140_90.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBPlower140_90.drl	7 Sep 2010 16:01:09 -0000	1.2
--- testBPlower140_90.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 19,23 ****
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 19,23 ----
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-LDL.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-LDL.drl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** diab-LDL.drl	25 Jul 2007 02:51:36 -0000	1.4
--- diab-LDL.drl	17 Nov 2010 16:35:04 -0000	1.5
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 3.5</java:condition> 
          <java:consequence>     
!               System.out.println("LDL 1 RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 3.5</java:condition> 
          <java:consequence>     
!               m.log("LDL 1 RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 28,32 ****
          <java:condition>m.getDataAsDouble() &gt;= 3.5</java:condition> 
          <java:consequence>     
!               System.out.println("LDL 2 RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH 1");
          </java:consequence>
--- 28,32 ----
          <java:condition>m.getDataAsDouble() &gt;= 3.5</java:condition> 
          <java:consequence>     
!               m.log("LDL 2 RULES IS GETTING RUN");
                m.setIndicationColor("HIGH 1");
          </java:consequence>

Index: testLDLlower2p6.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testLDLlower2p6.drl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testLDLlower2p6.drl	25 Jul 2007 02:51:36 -0000	1.5
--- testLDLlower2p6.drl	17 Nov 2010 16:35:04 -0000	1.6
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 2.0</java:condition>       
          <java:consequence>     
!               System.out.println("LDL RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 2.0</java:condition>       
          <java:consequence>     
!               m.log("LDL RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testBPlower131.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPlower131.drl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testBPlower131.drl	6 Jul 2007 19:18:52 -0000	1.3
--- testBPlower131.drl	17 Nov 2010 16:35:04 -0000	1.4
***************
*** 17,21 ****
          <java:condition>m.getNumberFromSplit("/",0) &lt; 131</java:condition>         
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getNumberFromSplit("/",0) &lt; 131</java:condition>         
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testA1Cabove7p9.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testA1Cabove7p9.drl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** testA1Cabove7p9.drl	6 Jul 2007 19:18:52 -0000	1.4
--- testA1Cabove7p9.drl	17 Nov 2010 16:35:04 -0000	1.5
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &gt; 7.9</java:condition>       
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &gt; 7.9</java:condition>       
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>
***************
*** 30,34 ****
          <java:condition>m.getDataAsDouble() &gt; 0.079</java:condition>       
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 30,34 ----
          <java:condition>m.getDataAsDouble() &gt; 0.079</java:condition>       
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: testBPabove140_90_1.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPabove140_90_1.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBPabove140_90_1.drl	7 Sep 2010 16:01:09 -0000	1.2
--- testBPabove140_90_1.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 19,23 ****
          <java:condition>m.getLastDateRecordedInMths() &lt; 7</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 19,23 ----
          <java:condition>m.getLastDateRecordedInMths() &lt; 7</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-TCHDL.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-TCHDL.drl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** diab-TCHDL.drl	6 Jul 2007 19:18:52 -0000	1.3
--- diab-TCHDL.drl	17 Nov 2010 16:35:04 -0000	1.4
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 5.0</java:condition> 
          <java:consequence>     
!               System.out.println("HCHDL 1 RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 5.0</java:condition> 
          <java:consequence>     
!               m.log("HCHDL 1 RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 28,32 ****
          <java:condition>m.getDataAsDouble() &gt;= 5.0</java:condition> 
          <java:consequence>     
!               System.out.println("HCHDL 2 RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH 1");
          </java:consequence>
--- 28,32 ----
          <java:condition>m.getDataAsDouble() &gt;= 5.0</java:condition> 
          <java:consequence>     
!               m.log("HCHDL 2 RULES IS GETTING RUN");
                m.setIndicationColor("HIGH 1");
          </java:consequence>

Index: diab-BMI.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-BMI.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-BMI.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-BMI.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &lt; 30</java:condition> 
          <java:consequence>     
!               System.out.println("BMI RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &lt; 30</java:condition> 
          <java:consequence>     
!               m.log("BMI RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 28,32 ****
          <java:condition>m.getDataAsDouble() &gt; 30</java:condition> 
          <java:consequence>     
!               System.out.println("BMI RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH 1");
          </java:consequence>
--- 28,32 ----
          <java:condition>m.getDataAsDouble() &gt; 30</java:condition> 
          <java:consequence>     
!               m.log("BMI RULES IS GETTING RUN");
                m.setIndicationColor("HIGH 1");
          </java:consequence>
***************
*** 39,43 ****
          <java:condition>m.getDataAsDouble() &lt; 18.5</java:condition> 
          <java:consequence>     
!               System.out.println("BMI RULES IS GETTING RUN");           
                m.setIndicationColor("LOW");
          </java:consequence>
--- 39,43 ----
          <java:condition>m.getDataAsDouble() &lt; 18.5</java:condition> 
          <java:consequence>     
!               m.log("BMI RULES IS GETTING RUN");
                m.setIndicationColor("LOW");
          </java:consequence>

Index: testBPlower130_80.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPlower130_80.drl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testBPlower130_80.drl	21 Nov 2008 15:24:19 -0000	1.1
--- testBPlower130_80.drl	17 Nov 2010 16:35:04 -0000	1.2
***************
*** 19,23 ****
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 19,23 ----
          <java:condition>m.getLastDateRecordedInMths() &lt; 13</java:condition>
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-A1C.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-A1C.drl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** diab-A1C.drl	19 Nov 2007 17:25:44 -0000	1.3
--- diab-A1C.drl	17 Nov 2010 16:35:04 -0000	1.4
***************
*** 16,20 ****
          <java:condition>m.getDataAsDouble() &gt;= 7</java:condition>       
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 16,20 ----
          <java:condition>m.getDataAsDouble() &gt;= 7</java:condition>       
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 28,32 ****
          <java:condition>m.getDataAsDouble() &gt;= 0.07</java:condition>    
          <java:consequence>     
!               System.out.println("A1C RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 28,32 ----
          <java:condition>m.getDataAsDouble() &gt;= 0.07</java:condition>    
          <java:consequence>     
!               m.log("A1C RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>

Index: testBPabove139.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/testBPabove139.drl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testBPabove139.drl	6 Jul 2007 19:18:52 -0000	1.3
--- testBPabove139.drl	17 Nov 2010 16:35:04 -0000	1.4
***************
*** 17,21 ****
          <java:condition>m.getNumberFromSplit("/",0) &gt; 139</java:condition>         
          <java:consequence>     
!               System.out.println("BP RULES IS GETTING RUN"+m.getDataAsDouble());           
                m.setInRange(true);
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getNumberFromSplit("/",0) &gt; 139</java:condition>         
          <java:consequence>     
!               m.log("BP RULES IS GETTING RUN"+m.getDataAsDouble());
                m.setInRange(true);
          </java:consequence>

Index: diab-ACR.drl
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/flowsheets/decisionSupport/diab-ACR.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diab-ACR.drl	6 Jul 2007 19:18:52 -0000	1.2
--- diab-ACR.drl	17 Nov 2010 16:35:04 -0000	1.3
***************
*** 17,21 ****
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               System.out.println("ACR RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 17,21 ----
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               m.log("ACR RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>
***************
*** 29,33 ****
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               System.out.println("ACR RULES IS GETTING RUN");           
                m.setIndicationColor("HIGH");
          </java:consequence>
--- 29,33 ----
          <java:condition>m.getDataAsDouble() &gt;= 2.0</java:condition> 
          <java:consequence>     
!               m.log("ACR RULES IS GETTING RUN");
                m.setIndicationColor("HIGH");
          </java:consequence>