Changeset 3915

Timestamp:

Nov 6, 2007, 11:56:36 AM (15 years ago)

Author:

Johan Enell

Message:

Fixes #795

File:

• branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (5 diffs)

branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -756 +756 @@
         }
       }
+      response.setDone("");
     }
     else
@@ -1309 +1310 @@
     BioAssaySet bas = null;
     SpotBatcher spotBatcher = null;
+    Boolean doPositionBatch = null;
 
     HashMap<String, BioAssay> idMap = new HashMap<String, BioAssay>();
@@ -1324 +1326 @@
       {
         bas = t.newProduct("new", "new", false);
+        doPositionBatch = true;
         bas.setName(getSourceBioAssaySet(dc).getName());
-
         List<String> columns = Arrays.asList(ffp.getHeader("columns").split("\\t"));
         int idCol = columns.indexOf("id");
@@ -1377 +1379 @@
         if (bas == null)
         {
-          bas = t.newProduct("new", "new", false);
+          bas = t.newProduct(null, "new", false);
+          doPositionBatch = false;
         }
         spotBatcher = bas.getSpotBatcher();
@@ -1537 +1540 @@
 
     //Batch reporters
-    if (bas != null)
+    if (bas != null && doPositionBatch)
     {
       PositionBatcher posBatcher = bas.getPositionBatcher();