Changeset 1366 for extensions

Timestamp:

May 23, 2011, 2:23:45 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #324: Problem registering a case for specimen tubes with children

Location:

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao

Files:

• Case.java (modified) (1 diff)
• SpecimenTube.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Case.java

@@ -69 +69 @@
       caseQuery.join(Hql.innerJoin("src", "event", "evt"));
       caseQuery.join(Hql.innerJoin("evt", "bioMaterial", "bm")); // 'bm' should now refernce a specimen tube
-      caseQuery.restrict(Restrictions.like(Hql.property("bm", "name"), Expressions.parameter("name", name + ".%", Type.STRING)));
+      caseQuery.restrict(Restrictions.rlike(Hql.property("bm", "name"), Expressions.parameter("name", "^" + name + "\\.[0-9]+$", Type.STRING)));
       caseQuery.setDistinct(true);
+      
+      System.out.println("cq:" + caseQuery);
       cases = caseQuery.list(dc);
       

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/SpecimenTube.java

@@ -34 +34 @@
     if (limitToOriginal)
     {
-      specimenQuery.restrict(Restrictions.like(Hql.property("name"), Expressions.parameter("name", theCase.getOriginalName() + ".%", Type.STRING)));
+      specimenQuery.restrict(Restrictions.rlike(Hql.property("name"), Expressions.parameter("name", "^" + theCase.getOriginalName() + "\\.[0-9]+$", Type.STRING)));
     }
     specimenQuery.order(Orders.asc(Hql.property("name")));
@@ -56 +56 @@
   {
     ItemQuery<Sample> specimenQuery = Sample.getQuery();
-    specimenQuery.restrict(Restrictions.like(Hql.property("name"), Expressions.parameter("name", name + ".%", Type.STRING)));
+    specimenQuery.restrict(Restrictions.rlike(Hql.property("name"), Expressions.parameter("name", "^" + name + "\\.[0-9]+$", Type.STRING)));
     specimenQuery.order(Orders.asc(Hql.property("name")));
     specimenQuery.include(Include.ALL);