Changeset 6093

Timestamp:

Aug 27, 2012, 12:42:05 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1707: Make it possible for a derived bioassay to have multiple physical bioassays as parents

Fixed the Illumina raw bioassay importer.

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/IlluminaRawDataImporter.java (modified) (2 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/IlluminaRawDataImporter.java

@@ -55 +55 @@
 import net.sf.basedb.core.Job;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PhysicalBioAssay;
 import net.sf.basedb.core.Platform;
 import net.sf.basedb.core.PluginParameter;
@@ -689 +690 @@
                 bioAssay = DerivedBioAssay.getById(dc, bioAssay.getId());
                 // Find extract on the given array position.
-                List<BioMaterialEventSource> sources = bioAssay.getPhysicalBioAssay().getCreationEvent().getEventSources(dc, arrayPosition);
-                // There must be exactly one source
-                if (sources.size() == 1) extract = (Extract)sources.get(0).getBioMaterial();
+                List<PhysicalBioAssay> physicalBioAssays = bioAssay.getPhysicalBioAssays().list(dc);
+                if (physicalBioAssays.size() == 1)
+                {
+                  List<BioMaterialEventSource> sources = physicalBioAssays.get(0).getCreationEvent().getEventSources(dc, arrayPosition);
+                  // There must be exactly one source
+                  if (sources.size() == 1) extract = (Extract)sources.get(0).getBioMaterial();
+                }
               }
             }