Changeset 2104

Timestamp:

Oct 25, 2013, 9:18:33 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #503: Change pooling strategy

Destroy *.dil items after pool has been completed. Existing *.dil items need to be fixed manually, by creating an event for the *.dil item removing all remaining biomaterial.

File:

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

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

@@ -14 +14 @@
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
+
 
 
@@ -24 +25 @@
 import net.sf.basedb.core.BioMaterialList;
 import net.sf.basedb.core.BioPlate;
+import net.sf.basedb.core.BioWell;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Extract;
@@ -422 +424 @@
               dil.setDescription("Represents the remaining " + Values.formatNumber(extraVolume, 1) + 
                 "µl aliquot after mixing " + Values.formatNumber(extraVolume*mixFactor, 1) + 
-                "µl solution before pooling. Stored at a temporary location.");
+                "µl solution before pooling. Stored at a temporary location until the pool has been completed.");
               BioMaterialEventSource libSrc = dil.getCreationEvent().addSource(lib);
               Annotationtype.POOL_MOLARITY.setAnnotationValue(dc, dil, mixMolarity);
@@ -556 +558 @@
               dilEvent.setEventDate(poolDate);
               dilEvent.setProtocol(poolProtocol);
-              //jsonMessages.add(dil.getName() + " registered");
+              
+              // Create event for destroying the biomaterial
+              BioMaterialEvent discardDil = dil.newEvent();
+              discardDil.setEventDate(poolDate);
+              discardDil.setProtocol(poolProtocol);
+              discardDil.setUsedQuantity(dil.getOriginalQuantity());
+              discardDil.setComment("Destroyed this aliquot after pooling was completed.");
+              dc.saveItem(discardDil);
+
+              BioWell libWell = lib.getExtract().getBioWell();
+              String location = libWell == null ? "" : " (" + libWell.getCoordinate() + ")";
+              
+              jsonMessages.add(dil.getName() + location + " aliquot registered as destroyed");
             }
           }         
-          jsonMessages.add("Pool '" + pool.getName() + "' registered as completed.");
+          jsonMessages.add(pool.getName() + " registered as completed.");
         }