Changeset 2091

Timestamp:

Oct 21, 2013, 12:51:45 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #512: Updates to the register pooled libraries wizard

Improved performance when loading library plate information for pools. There is no need to load the individual libraries in all pools. Better to only use the code developed for #502 in [2090] to load library bioplates directly.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/libprep/pool_protocol.jsp (modified) (2 diffs)
• resources/libprep/pool_registration.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/PoolServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_protocol.jsp

@@ -28 +28 @@
 
 <script language="JavaScript">
-var debug = false;
+var debug = 0;
 var currentStep = 1;
 
@@ -52 +52 @@
       var pool = pools[poolNo];
       
-      var libPlateForPool = null;
-      for (var libNo = 0; libNo < pool.libraries.length; libNo++)
-      {
-        var lib = pool.libraries[libNo];
-        var libPlate = lib.bioWell.bioPlate;
-        
-        if (libNo == 0)
-        {
-          libPlateForPool = libPlate;
-        }
-        else if (libPlateForPool.id != libPlate.id)
-        {
-          libPlateForPool = null;
-          break;
-        }
-      }
-      
-      // Store the library bioplate
-      pool.libPlate = libPlateForPool;
-      
+      // Shortcut to single-plate pools
+      var libPlateForPool = pool.libPlates.length == 1 ? pool.libPlates[0] : null;
+      pool.libPlate = libPlateForPool
+    
       // If the pool has a single library bioplate add it to the selection list
       // If the pool doesn't have a single library bioplate, nothing is added to

extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_registration.jsp

@@ -55 +55 @@
       var pool = pools[poolNo];
       
-      var libPlateForPool = null;
-      for (var libNo = 0; libNo < pool.libraries.length; libNo++)
-      {
-        var lib = pool.libraries[libNo];
-        var libPlate = lib.bioWell.bioPlate;
-        
-        if (libNo == 0)
-        {
-          libPlateForPool = libPlate;
-        }
-        else if (libPlateForPool.id != libPlate.id)
-        {
-          libPlateForPool = null;
-          break;
-        }
-      }
-      
-      // Store the library bioplate
-      pool.libPlate = libPlateForPool;
-      
+      // Shortcut to single-plate pools
+      var libPlateForPool = pool.libPlates.length == 1 ? pool.libPlates[0] : null;
+      pool.libPlate = libPlateForPool
+
       // If the pool has a single library bioplate add it to the selection list
       // If the pool doesn't have a single library bioplate, nothing is added to

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

@@ -249 +249 @@
         for (PooledLibrary pool : pools)
         {
+          pool.loadLibPlates(dc);
           pool.loadAnnotations(dc, "molarity", Annotationtype.POOL_MOLARITY, null);
           pool.loadAnnotations(dc, "conc", Annotationtype.POOL_CONC, null);
@@ -254 +255 @@
           pool.setAnnotation("comments", pool.getExtract().getDescription());
           jsonPools.add(pool.asJSONObject());
-          
-          List<Library> libs = Library.getByPool(dc, pool);
-          JSONArray jsonLibs = new JSONArray();
-          for (Library lib : libs)
-          {
-            lib.loadBioPlateLocation();
-            lib.setAnnotation("comment", lib.getExtract().getDescription());
-            jsonLibs.add(lib.asJSONObject());
-          }
-          pool.setAnnotation("libraries", jsonLibs);
         }
         json.put("pools", jsonPools);