Changeset 4629

Timestamp:

Nov 6, 2008, 9:26:09 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1162: Raw bioassay importer fails with InvalidUseOfNullException? when raw data type is not found

The last fix ([4622]) created a problem with file-only platforms that has an implicit raw data type.

File:

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

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/RawBioAssayImporter.java

@@ -329 +329 @@
       variant = getProjectDefaultVariant(dc);
     }
-    if (rawDataTypeMapper != null)
-    {
-      rawDataType = RawDataTypes.getSafeRawDataType(rawDataTypeMapper.getValue(data));
-    }
-    else
-    {
-      rawDataType = getProjectDefaultRawDataType(dc);
+    if (variant != null && rawDataType == null) rawDataType = variant.getRawDataType();
+    if (platform != null && rawDataType == null) rawDataType = platform.getRawDataType();
+    if (rawDataType == null)
+    {
+      if (rawDataTypeMapper != null)
+      {
+        rawDataType = RawDataTypes.getSafeRawDataType(rawDataTypeMapper.getValue(data));
+      }
+      else
+      {
+        rawDataType = getProjectDefaultRawDataType(dc);
+      }
     }
     
@@ -383 +388 @@
         variant = findVariant(dc, platform, FallbackIdMethod.NAME_OR_EXTERNALID_OR_ID, variantMapper.getValue(data));
       }
-      if (rawDataTypeMapper != null)
+      if (variant != null && rawDataType == null) rawDataType = variant.getRawDataType();
+      if (platform != null && rawDataType == null) rawDataType = platform.getRawDataType();
+      if (rawDataType == null && rawDataTypeMapper != null)
       {
         rawDataType = RawDataTypes.getSafeRawDataType(rawDataTypeMapper.getValue(data));