Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2496/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
Modified Files:
RxWriteScriptAction.java RxSearchDrugAction.java
Log Message:
removed all system.outs
Index: RxSearchDrugAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxSearchDrugAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RxSearchDrugAction.java 9 Jul 2010 21:56:35 -0000 1.12
--- RxSearchDrugAction.java 12 Jul 2010 22:30:10 -0000 1.13
***************
*** 39,42 ****
--- 39,43 ----
import org.apache.struts.action.ActionMapping;
import org.apache.struts.actions.DispatchAction;
+ import org.oscarehr.util.MiscUtils;
import oscar.oscarRx.data.RxDrugData;
***************
*** 73,79 ****
drugSearch = drugData.listDrug(searchString);
}
! }catch(Exception connEx){
! System.out.print(connEx.getMessage());
! connEx.printStackTrace();
}
request.setAttribute("drugSearch", drugSearch);
--- 74,79 ----
drugSearch = drugData.listDrug(searchString);
}
! }catch(Exception connEx){
! MiscUtils.getLogger().error("Error", connEx);
}
request.setAttribute("drugSearch", drugSearch);
Index: RxWriteScriptAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxWriteScriptAction.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** RxWriteScriptAction.java 12 Jul 2010 19:03:32 -0000 1.65
--- RxWriteScriptAction.java 12 Jul 2010 22:30:10 -0000 1.66
***************
*** 71,84 ****
public void p(String s) {
- System.out.println(s);
}
public void p(String s, String s1) {
- System.out.println(s + "=" + s1);
}
public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, Exception {
- // System.out.println("***===========IN unspecified RxWriteScriptAction.java");
RxWriteScriptForm frm = (RxWriteScriptForm) form;
--- 71,81 ----
***************
*** 162,166 ****
}
- System.out.println("SAVING STASH " + rx.getCustomInstr());
logger.debug("SAVING STASH " + rx.getCustomInstr());
if (rx.getSpecial() == null) {
--- 159,162 ----
***************
*** 174,179 ****
annotation_attrib = "";
}
! // System.out.println("SETTING ANNOTATE NAME '" + annotation_attrib + "'");
! // System.out.println("SETTING StashIndex '" + "" + bean.getStashIndex() + "'");
bean.addAttributeName(annotation_attrib, bean.getStashIndex());
bean.setStashItem(bean.getStashIndex(), rx);
--- 170,174 ----
annotation_attrib = "";
}
!
bean.addAttributeName(annotation_attrib, bean.getStashIndex());
bean.setStashItem(bean.getStashIndex(), rx);
***************
*** 197,201 ****
for (i = 0; i < bean.getStashSize(); i++) {
rx = bean.getStashItem(i);
! // System.out.println("*** before rx.Save(" + scriptId.toString() + ")");
rx.Save(scriptId);
auditStr.append(rx.getAuditString());
--- 192,196 ----
for (i = 0; i < bean.getStashSize(); i++) {
rx = bean.getStashItem(i);
!
rx.Save(scriptId);
auditStr.append(rx.getAuditString());
***************
*** 223,227 ****
rx = null;
}
- // System.out.println("bean.getStashIndex() after update,print,save=" + bean.getStashIndex());
fwd = "viewScript";
String ip = request.getRemoteAddr();
--- 218,221 ----
***************
*** 231,240 ****
}
}
- // System.out.println("***===========End of unspecified RxWriteScriptAction.java");
return mapping.findForward(fwd);
}
public ActionForward updateReRxDrug(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
- System.out.println("** in updateReRxDrug ***");
oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) request.getSession().getAttribute("RxSessionBean");
if (bean == null) {
--- 225,232 ----
***************
*** 252,258 ****
bean.clearReRxDrugIdList();
}else{
! System.out.println("WARNING: reRxDrugId not updated");
}
! System.out.println("ReRxDrugIdList="+bean.getReRxDrugIdList());
return null;
--- 244,250 ----
bean.clearReRxDrugIdList();
}else{
! MiscUtils.getLogger().warn("WARNING: reRxDrugId not updated");
}
!
return null;
***************
*** 294,302 ****
WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
String provider = (String) request.getSession().getAttribute("user");
- //System.out.println("provider=" + provider);
if (provider != null) {
userPropertyDAO = (UserPropertyDAO) ctx.getBean("UserPropertyDAO");
UserProperty prop = userPropertyDAO.getProp(provider, UserProperty.RX_DEFAULT_QUANTITY);
- //System.out.println("prop="+prop);
if(prop!=null)
RxUtil.setDefaultQuantity(prop.getValue());
--- 286,292 ----
***************
*** 307,311 ****
}
} catch (Exception e) {
! e.printStackTrace();
}
}
--- 297,301 ----
}
} catch (Exception e) {
! MiscUtils.getLogger().error("Error", e);
}
}
***************
*** 410,414 ****
List<HashMap<String,String>> retList=new ArrayList();
retList=RxUtil.getPreviousInstructions(rx);
! System.out.println("previous instructions="+retList);
bean.setListMedHistory(retList);
return null;
--- 400,404 ----
List<HashMap<String,String>> retList=new ArrayList();
retList=RxUtil.getPreviousInstructions(rx);
!
bean.setListMedHistory(retList);
return null;
***************
*** 629,633 ****
if (action != null && action.equals("parseInstructions")) {
! System.out.println("==========***### IN parseInstruction RxWriteScriptAction.java");
try {
String randomId = request.getParameter("randomId");
--- 619,623 ----
if (action != null && action.equals("parseInstructions")) {
!
try {
String randomId = request.getParameter("randomId");
***************
*** 635,639 ****
RxPrescriptionData.Prescription rx = bean.getStashItem2(Integer.parseInt(randomId));
if (rx == null) {
- System.out.println("rx is null");
logger.error("rx is null", new NullPointerException());
}
--- 625,628 ----
***************
*** 759,769 ****
throws IOException, ServletException, Exception {
oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) request.getSession().getAttribute("RxSessionBean");
- //System.out.println("iterateStash");
- //RxUtil.printStashContent(bean);
List<RxPrescriptionData.Prescription> listP = Arrays.asList(bean.getStash());
if (listP.size() == 0) {
return null;
} else {
- //System.out.println("size "+listP.size()+" ; "+listP.get(0));
request.setAttribute("listRxDrugs", listP);
return (mapping.findForward("newRx"));
--- 748,755 ----
***************
*** 779,783 ****
String randomId=request.getParameter("randomId");
String specialInstruction=request.getParameter("specialInstruction");
- //System.out.println("specialInstruction ="+specialInstruction.trim());
oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) request.getSession().getAttribute("RxSessionBean");
RxPrescriptionData.Prescription rx = bean.getStashItem2(Integer.parseInt(randomId));
--- 765,768 ----
***************
*** 792,796 ****
public ActionForward updateProperty(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, Exception {
- System.out.println("==========***### start updateOneProperty RxWriteScriptAction.java");
oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) request.getSession().getAttribute("RxSessionBean");
String elem=request.getParameter("elementId");
--- 777,780 ----
***************
*** 847,851 ****
public ActionForward updateSaveAllDrugs(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, Exception {
- //System.out.println("==========***### start updaing drugs RxWriteScriptAction.java");
oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) request.getSession().getAttribute("RxSessionBean");
request.getSession().setAttribute("rePrint", null);//set to print.
--- 831,834 ----
***************
*** 855,863 ****
while (em.hasMoreElements()) {
String ele = em.nextElement().toString();
- //System.out.println("ele>" + ele);
paramList.add(ele);
if (ele.startsWith("drugName_")) {
String rNum = ele.substring(9);
- //System.out.println("rNum:" + rNum);
if (!randNum.contains(rNum)) {
randNum.add(rNum);
--- 838,844 ----
***************
*** 875,879 ****
try {
if(stashIndex==-1){
- System.out.println("stashIndex is -1");
continue;
}
--- 856,859 ----
***************
*** 893,897 ****
String val = request.getParameter(elem);
val=val.trim();
- System.out.println("paramName=" + elem + ", value=" + val);
if (elem.startsWith("drugName_" + num)) {
if (rx.isCustom()) {
--- 873,876 ----
***************
*** 1031,1035 ****
rx.setSpecial(special.trim());
- System.out.println("SETTING SPECIAL TOO >" + special + "<");
--- 1010,1013 ----
***************
*** 1103,1107 ****
rx = bean.getStashItem(i);
rx.Save(scriptId);//new drug id availble after this line
- System.out.println("adding rd pair="+rx.getRandomId()+"--"+rx.getDrugId());
bean.addRandomIdDrugIdPair(rx.getRandomId(), rx.getDrugId());
auditStr.append(rx.getAuditString());
--- 1081,1084 ----
|