Changeset 5242

Timestamp:

Feb 11, 2010, 11:05:48 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

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

Fixed some remaining issues (NullPointerException?) when running without a configuration and when used to import reporter lists.

File:

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

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

@@ -328 +328 @@
         storeValue(configuration, request, complexMappings);
         boolean allowComplex = "allow".equals(request.getParameterValue(complexMappings.getName()));
-        for (PluginParameter<String> pp : getAllColumnMappings())
+        for (PluginParameter<String> pp : getAllColumnMappings(false))
         {
           String mapExpression = (String)request.getParameterValue(pp.getName());
@@ -348 +348 @@
           return;
         }
-        if (context != null && 
-          (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE))
+        
+        boolean reporterListContext = context != null && 
+          (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE);
+        if (reporterListContext)
         {
           storeValue(job, request, reporterListParameter);
@@ -371 +373 @@
         storeValue(job, request, complexMappings);
         boolean allowComplex = "allow".equals(request.getParameterValue(complexMappings.getName()));
-        for (PluginParameter<String> pp : getAllColumnMappings())
+        for (PluginParameter<String> pp : getAllColumnMappings(reporterListContext))
         {
           String mapExpression = (String)request.getParameterValue(pp.getName());
@@ -439 +441 @@
     extendedProperties = ExtendedProperties.getProperties("ReporterData");
     batcher = ReporterBatcher.getNew(dc);
-    reporterType = (ReporterType)configuration.getValue("reporterType");
+    reporterType = (ReporterType)getJobOrConfigurationValue("reporterType");
     reporterList = (ReporterList)job.getValue("reporterList");
     String mode = (String)job.getValue("mode");
@@ -537 +539 @@
         {
           ReporterData reporter = batcher.getByExternalId(entry.getKey());
-          reporterList.addReporter(reporter, entry.getValue());
-          numAddedToList++;
+          if (reporterList.addReporter(reporter, entry.getValue()))
+          {
+            numAddedToList++;
+          }
         }
       }
@@ -644 +648 @@
           else
           {
-            reporterList.addReporter(reporter, score);
-            numAddedToList++;
+            if (reporterList.addReporter(reporter, score))
+            {
+              numAddedToList++;
+            }
           }
         }
@@ -732 +738 @@
   // -------------------------------------------
   
-  private List<PluginParameter<String>> getAllColumnMappings()
+  private List<PluginParameter<String>> getAllColumnMappings(boolean reporterListContext)
   {
     if (allColumnMappings == null)
@@ -738 +744 @@
       // Column mappings
       allColumnMappings = new ArrayList<PluginParameter<String>>();
-      allColumnMappings.add(nameColumnMapping);
-      allColumnMappings.add(reporterIdColumnMapping);
-      allColumnMappings.add(descriptionColumnMapping);
-      allColumnMappings.add(symbolColumnMapping);
-      allColumnMappings.add(scoreColumnMapping);
-      allColumnMappings.add(reporterTypeColumnMapping);
-      List<ExtendedProperty> extended = ExtendedProperties.getProperties("ReporterData");
-      if (extended != null)
-      {
-        for (ExtendedProperty ep : extended)
-        {
-          allColumnMappings.add(
-            new PluginParameter<String>(
-              "extendedColumnMapping."+ep.getName(),
-              ep.getTitle(),
-              ep.getDescription(),
-              optionalColumnMapping
-              )
-            );
+      if (reporterListContext)
+      {
+        allColumnMappings.add(reporterIdColumnMapping);
+        allColumnMappings.add(scoreColumnMapping);
+      }
+      else
+      {
+        allColumnMappings.add(nameColumnMapping);
+        allColumnMappings.add(reporterIdColumnMapping);
+        allColumnMappings.add(descriptionColumnMapping);
+        allColumnMappings.add(symbolColumnMapping);
+        allColumnMappings.add(reporterTypeColumnMapping);
+        List<ExtendedProperty> extended = ExtendedProperties.getProperties("ReporterData");
+        if (extended != null)
+        {
+          for (ExtendedProperty ep : extended)
+          {
+            allColumnMappings.add(
+              new PluginParameter<String>(
+                "extendedColumnMapping."+ep.getName(),
+                ep.getTitle(),
+                ep.getDescription(),
+                optionalColumnMapping
+                )
+              );
+          }
         }
       }
@@ -843 +856 @@
       parameters.add(cloneParameterWithDefaultValue(maxDataColumnsParameter));
       parameters.add(Parameters.charsetParameter(null, null, 
-          (String)configuration.getValue(Parameters.CHARSET_PARAMETER)));
+          (String)getJobOrConfigurationValue(Parameters.CHARSET_PARAMETER)));
       parameters.add(Parameters.decimalSeparatorParameter(null, null, 
-          (String)configuration.getValue(Parameters.DECIMAL_SEPARATOR_PARAMETER)));
+          (String)getJobOrConfigurationValue(Parameters.DECIMAL_SEPARATOR_PARAMETER)));
 
       // Column mappings
       parameters.add(mappingSection);
       parameters.add(complexMappings);
-      parameters.addAll(getAllColumnMappings());
+      parameters.addAll(getAllColumnMappings(reporterListContext));
       
       parameters.add(errorSection);
@@ -914 +927 @@
       parameters.add(mappingSection);
       parameters.add(complexMappings);
-      parameters.addAll(getAllColumnMappings());
+      parameters.addAll(getAllColumnMappings(false));
       
       configurePlugin = new RequestInformation