Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25672/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
Modified Files:
OrderAction.java
Log Message:
corrects bugs
Index: OrderAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** OrderAction.java 21 Nov 2006 10:40:25 -0000 1.47
--- OrderAction.java 21 Nov 2006 13:01:39 -0000 1.48
***************
*** 261,278 ****
context.put("data",data);
//this is for the submit from url
! context.put("other", data.getParameters().getString("other",""));
! context.put("othernuc", data.getParameters().getString("othernuc",""));
! context.put("care", data.getParameters().getString("care",""));
! context.put("strength", ""+data.getParameters().getString("strength",""));
! context.put("solvent", data.getParameters().getString("solvent",""));
! context.put("nuclei", data.getParameters().getString("type",""));
! context.put("usersid", data.getParameters().getString("usersid",""));
! context.put("usersidcomment", data.getParameters().getString("usersidcomment",""));
! context.put("ordertype", data.getParameters().getString("process",""));
! if(data.getParameters().getString("probablestructure")!=null && !data.getParameters().getString("probablestructure").equals("")){
! String filename="/nmrshiftdbhtml/" + System.currentTimeMillis() + "userorder.jpg";
! GeneralUtils.makeJpg(data.getParameters().getString("probablestructure",""),filename,data.getServletConfig(),200,200,false);
! context.put("imagefile",filename);
! context.put("urlmol",data.getParameters().getString("probablestructure"));
}else{
context.put("imagefile", "none");
--- 261,282 ----
context.put("data",data);
//this is for the submit from url
! if(data.getParameters().getString("nmrshiftdbaction","").equals("submitfromlabjournal")){
! context.put("other", data.getParameters().getString("other",""));
! context.put("othernuc", data.getParameters().getString("othernuc",""));
! context.put("care", data.getParameters().getString("care",""));
! context.put("strength", ""+data.getParameters().getString("strength",""));
! context.put("solvent", data.getParameters().getString("solvent",""));
! context.put("nuclei", data.getParameters().getString("type",""));
! context.put("usersid", data.getParameters().getString("usersid",""));
! context.put("usersidcomment", data.getParameters().getString("usersidcomment",""));
! context.put("ordertype", data.getParameters().getString("process",""));
! if(data.getParameters().getString("probablestructure")!=null && !data.getParameters().getString("probablestructure").equals("")){
! String filename="/nmrshiftdbhtml/" + System.currentTimeMillis() + "userorder.jpg";
! GeneralUtils.makeJpg(data.getParameters().getString("probablestructure",""),filename,data.getServletConfig(),200,200,false);
! context.put("imagefile",filename);
! context.put("urlmol",data.getParameters().getString("probablestructure"));
! }else{
! context.put("imagefile", "none");
! }
}else{
context.put("imagefile", "none");
***************
*** 432,435 ****
--- 436,440 ----
sample.save();
}
+ System.err.println("_"+message+"_");
if(!message.equals("")){
context.put("ordertype",data.getParameters().get("process"));
***************
*** 464,467 ****
--- 469,474 ----
String message="";
DBSample sample=DBSamplePeer.retrieveByPK(new NumberKey(data.getParameters().get("editid")));
+ sample.setUsersId(data.getParameters().get("sampleid"));
+ sample.setUsersIdComment(data.getParameters().get("sampleidcomment"));
DBCondition solvent;
if(data.getParameters().get("solvent")!=null && !data.getParameters().get("solvent").equals("")){
***************
*** 527,530 ****
--- 534,539 ----
if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){
sample.setOtherWishedSpectrum(data.getParameters().get("othertext"));
+ }else{
+ sample.setOtherWishedSpectrum("");
}
if(wishedSpectrum.equals("")){
***************
*** 533,537 ****
sample.save();
}
! if(!message.equals("") && sample.getOtherNuclei().equals("") && sample.getOtherNuclei().equals("")){
context.put("ordertype",data.getParameters().get("process"));
context.put("usersid",data.getParameters().get("sampleid"));
--- 542,546 ----
sample.save();
}
! if(!message.equals("")){
context.put("ordertype",data.getParameters().get("process"));
context.put("usersid",data.getParameters().get("sampleid"));
***************
*** 606,610 ****
context.put("nuclei","");
context.put("strength",sample.getMachine());
- System.err.println("_"+sample.getProbableStructure()+"_");
if(!(sample.getProbableStructure()+"").equals("")){
//The mol is put into the MView applet via a file
--- 615,618 ----
|
