[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Or
Brought to you by:
steinbeck
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:51:30
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17527/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderFullfillAction.java Log Message: workers can now delete orders Index: OrderFullfillAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** OrderFullfillAction.java 24 Nov 2006 13:48:44 -0000 1.29 --- OrderFullfillAction.java 29 Nov 2006 12:51:25 -0000 1.30 *************** *** 23,26 **** --- 23,28 ---- import org.openscience.nmrshiftdb.om.DBMachinePeer; import org.openscience.nmrshiftdb.om.DBRawFile; + import org.openscience.nmrshiftdb.om.DBRawFileDBSpectrumPeer; + import org.openscience.nmrshiftdb.om.DBRawFilePeer; import org.openscience.nmrshiftdb.om.DBSample; import org.openscience.nmrshiftdb.om.DBSamplePeer; *************** *** 219,221 **** --- 221,245 ---- } } + + public void doDeleteorder(RunData data, Context context) throws Exception { + try{ + if(data.getParameters().get("confirm")!=null && data.getParameters().get("confirm").equals("confirm")){ + Criteria crit=new Criteria(); + crit.add(DBSamplePeer.SAMPLE_ID,data.getParameters().get("id")); + Vector v=DBRawFilePeer.doSelect(crit); + for(int i=0;i<v.size();i++){ + DBRawFile rf=(DBRawFile)v.get(i); + Criteria crit2=new Criteria(); + crit2.add(DBRawFilePeer.RAW_FILE_ID,rf.getRawFileId()); + DBRawFileDBSpectrumPeer.doDelete(crit); + } + DBRawFilePeer.doDelete(crit); + DBSamplePeer.doDelete(crit); + buildOrderContext(context,data); + } + }catch(Exception ex){ + ex.printStackTrace(); + GeneralUtils.logError(ex,"guestbook/doentry",data,true); + } + } } |