[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets DetailPortlet.java
Brought to you by:
steinbeck
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3468/src/java/org/openscience/nmrshiftdb/portlets Modified Files: DetailPortlet.java PredictPortlet.java ReviewPortlet.java SubmitPortlet.java Log Message: this has the changes from the discussion with the lab system users Index: DetailPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/DetailPortlet.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -r1.69 -r1.70 *** DetailPortlet.java 27 Jun 2006 14:29:17 -0000 1.69 --- DetailPortlet.java 30 Oct 2006 15:45:32 -0000 1.70 *************** *** 67,70 **** --- 67,73 ---- session.setAttribute("applet","applet"); } + if(req.getParameter("applet") !=null && req.getParameter("applet").equals("noapplet")){ + runData.getSession().setAttribute("applet","noapplet"); + } //used for storing the results for browsing between result pages Vector results = (Vector) session.getAttribute("results"); Index: PredictPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/PredictPortlet.java,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -r1.174 -r1.175 *** PredictPortlet.java 9 Oct 2006 13:24:38 -0000 1.174 --- PredictPortlet.java 30 Oct 2006 15:45:32 -0000 1.175 *************** *** 680,683 **** --- 680,686 ---- session.setAttribute("applet", "applet"); } + if(req.getParameter("applet") !=null && req.getParameter("applet").equals("noapplet")){ + runData.getSession().setAttribute("applet","noapplet"); + } StringBuffer input = (StringBuffer) session.getAttribute(NmrshiftdbConstants.INPUT); String action = null; Index: ReviewPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/ReviewPortlet.java,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -r1.118 -r1.119 *** ReviewPortlet.java 8 Jun 2006 11:02:36 -0000 1.118 --- ReviewPortlet.java 30 Oct 2006 15:45:32 -0000 1.119 *************** *** 88,91 **** --- 88,94 ---- session.setAttribute("applet","applet"); } + if(req.getParameter("applet") !=null && req.getParameter("applet").equals("noapplet")){ + runData.getSession().setAttribute("applet","noapplet"); + } //No login necessary for reviewbyurl if (action != null && action.equals("reviewbyurl")) { Index: SubmitPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/SubmitPortlet.java,v retrieving revision 1.424 retrieving revision 1.425 diff -C2 -r1.424 -r1.425 *** SubmitPortlet.java 23 Oct 2006 11:58:09 -0000 1.424 --- SubmitPortlet.java 30 Oct 2006 15:45:32 -0000 1.425 *************** *** 270,273 **** --- 270,276 ---- session.setAttribute("applet","applet"); } + if(req.getParameter("applet") !=null && req.getParameter("applet").equals("noapplet")){ + runData.getSession().setAttribute("applet","noapplet"); + } if ((req.getContentType() != null && req.getContentType().indexOf("multipart/form-data") > -1 && runData.getParameters().getFileItems("Datei2") != null) || (req.getContentType() != null && req.getContentType().indexOf("multipart/form-data") > -1 && subData != null && subData.getLevel() == 2)) { action = "uploadjcamp"; *************** *** 332,339 **** crit.add(DBRawFilePeer.RAW_FILE_ID,runData.getParameters().get("id")); DBRawFile rawfile=((DBRawFile)DBRawFilePeer.doSelect(crit).get(0)); ! rawfile.setAssigned("true"); ! rawfile.save(); DBSample sample=DBSamplePeer.retrieveByPK(rawfile.getSampleId()); ! sample.getDBMolecule().addValuesToSubmittingData(subData,null,false); subData.setSpectrumKeywords(((NmrshiftdbUser)runData.getUser()).getDBLabGroup().getLabgroupName()); subData.fullfillsOrder=new NumberKey(runData.getParameters().get("id")); --- 335,343 ---- crit.add(DBRawFilePeer.RAW_FILE_ID,runData.getParameters().get("id")); DBRawFile rawfile=((DBRawFile)DBRawFilePeer.doSelect(crit).get(0)); ! subData.rawfile=rawfile; DBSample sample=DBSamplePeer.retrieveByPK(rawfile.getSampleId()); ! if(!new String(sample.getProbableStructure()+"").equals("")){ ! sample.getDBMolecule().addValuesToSubmittingData(subData,null,false); ! } subData.setSpectrumKeywords(((NmrshiftdbUser)runData.getUser()).getDBLabGroup().getLabgroupName()); subData.fullfillsOrder=new NumberKey(runData.getParameters().get("id")); |