Changeset 1976

Timestamp:

May 15, 2013, 2:28:40 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #480: Register pooled libraries

Set creation date on .dil items so that we know they have been created.

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PoolServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PoolServlet.java

@@ -374 +374 @@
               libSrc.setUsedQuantity(usedQuantityForExtra);
               dil.setOriginalQuantity(usedQuantityForExtra);
+              dil.setTag(lib.getTag());
               dc.saveItem(dil);
               
@@ -403 +404 @@
         
         Protocol poolProtocol = poolProtocolId == null ? null : Protocol.getById(dc, poolProtocolId.intValue());
+
+        ItemQuery<Extract> dilQuery = Extract.getQuery();
+        dilQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.parameter("dilName", Type.STRING)));
+        dilQuery.restrict(Restrictions.eq(Hql.property("creationEvent.eventDate"), null));
+        dilQuery.setIncludes(Reggie.INCLUDE_IN_CURRENT_PROJECT);
         
         JSONArray jsonPools = (JSONArray)jsonReq.get("pools");        
@@ -408 +414 @@
         {
           Number poolId = (Number)jsonPools.get(i);
-          Extract pool = Extract.getById(dc, poolId.intValue());
-          BioMaterialEvent creationEvent = pool.getCreationEvent();
+          PooledLibrary pool = PooledLibrary.getById(dc, poolId.intValue());
+          Extract poolExtract = pool.getExtract();
+          BioMaterialEvent creationEvent = poolExtract.getCreationEvent();
           
           creationEvent.setEventDate(poolDate);
           creationEvent.setProtocol(poolProtocol);
-          pool.setDescription(comment);
-          
+          poolExtract.setDescription(comment);
+          
+          // Check if there are any .dil items
+          List<Library> libs = Library.getByPool(dc, pool);
+          for (Library lib : libs)
+          {
+            dilQuery.setParameter("dilName", lib.getName()+".dil", Type.STRING);
+            List<Extract> result = dilQuery.list(dc);
+            if (result.size() == 1)
+            {
+              Extract dil = result.get(0);
+              BioMaterialEvent dilEvent = dil.getCreationEvent();
+              dilEvent.setEventDate(poolDate);
+              dilEvent.setProtocol(poolProtocol);
+              //jsonMessages.add(dil.getName() + " registered");
+            }
+          }         
           jsonMessages.add("Pool '" + pool.getName() + "' registered as completed.");
         }