Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23565/src/java/org/openscience/nmrshiftdb/om
Modified Files:
DBConditionPeer.java
Log Message:
if changing to/from java mode in lab system, the entered values are kept
Index: DBConditionPeer.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBConditionPeer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** DBConditionPeer.java 4 Aug 2005 21:55:20 -0000 1.8
--- DBConditionPeer.java 6 Nov 2006 13:40:08 -0000 1.9
***************
*** 4,7 ****
--- 4,8 ----
import java.util.Vector;
+ import org.apache.turbine.om.NumberKey;
import org.apache.turbine.util.db.Criteria;
***************
*** 43,46 ****
--- 44,64 ----
return (DBConditionPeer.doSelect(crit));
}
+
+ public static DBCondition makeNewOrGetExisting(NumberKey type, String value,NmrshiftdbUser user) throws Exception{
+ Criteria crit=new Criteria();
+ crit.add(DBConditionPeer.CONDITION_TYPE_ID, type);
+ crit.add(DBConditionPeer.VALUE, value);
+ Vector v=DBConditionPeer.doSelect(crit);
+ if(v.size()>0){
+ return (DBCondition)v.get(0);
+ }else{
+ DBCondition cond=new DBCondition();
+ cond.setConditionTypeId(type);
+ cond.setValue(value);
+ cond.setUserId(user.getUserId());
+ cond.save();
+ return cond;
+ }
+ }
}
|
