Changeset 5243

Timestamp:

Feb 12, 2010, 9:22:15 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1446: Use the core "Reporter importer" without a file format configuration

This should make the plug-in less sensitive to programs that use it with file parsing parameters in the configuration instead of in the job.

File:

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

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

@@ -493 +493 @@
     // Mapper that always return null
     Mapper nullMapper = new ConstantMapper((String)null);
-    idMapper = getMapper(ffp, (String)job.getValue("reporterIdColumnMapping"), 
+    idMapper = getMapper(ffp, (String)getJobOrConfigurationValue("reporterIdColumnMapping"), 
       cropStrings ? ReporterData.MAX_EXTERNAL_ID_LENGTH : null, nullMapper);
     if (!deleteMode)
     {
-      nameMapper = getMapper(ffp, (String)job.getValue("nameColumnMapping"), 
+      nameMapper = getMapper(ffp, (String)getJobOrConfigurationValue("nameColumnMapping"), 
         cropStrings ? ReporterData.MAX_NAME_LENGTH : null, null);
-      symbolMapper = getMapper(ffp, (String)job.getValue("symbolColumnMapping"), 
+      symbolMapper = getMapper(ffp, (String)getJobOrConfigurationValue("symbolColumnMapping"), 
         cropStrings ? ReporterData.MAX_SYMBOL_LENGTH : null, null);
-      descriptionMapper = getMapper(ffp, (String)job.getValue("descriptionColumnMapping"), 
+      descriptionMapper = getMapper(ffp, (String)getJobOrConfigurationValue("descriptionColumnMapping"), 
         cropStrings ? ReporterData.MAX_DESCRIPTION_LENGTH : null, null);
-      reporterTypeMapper = getMapper(ffp, (String)job.getValue("reporterTypeColumnMapping"), 
+      reporterTypeMapper = getMapper(ffp, (String)getJobOrConfigurationValue("reporterTypeColumnMapping"), 
         cropStrings ? ReporterType.MAX_NAME_LENGTH : null, null);
-      scoreMapper = getMapper(ffp, (String)job.getValue("scoreColumnMapping"), null, null);
+      scoreMapper = getMapper(ffp, (String)getJobOrConfigurationValue("scoreColumnMapping"), null, null);
       
       reporterTypes = new HashMap<String, ReporterType>();
@@ -515 +515 @@
         {
           String name = "extendedColumnMapping." + ep.getName();
-          Mapper m = getMapper(ffp, (String)job.getValue(name), 
+          Mapper m = getMapper(ffp, (String)getJobOrConfigurationValue(name), 
             cropStrings && ep.getLength() > 0 ? ep.getLength() : null, null);
           if (m != null) extendedMappers.put(ep, m);