Changeset 4036

Timestamp:

Dec 5, 2007, 9:39:17 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #851: Migration doesn't transfer 'reportermap' wizzzard configurations

Location:

trunk/src/clients/migrate/net/sf/basedb/clients/migrate

Files:

• PluginTransfer.java (modified) (1 diff)
• WizzzardTransfer.java (modified) (4 diffs)

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/PluginTransfer.java

@@ -182 +182 @@
     catch (BaseException e)
     {
-      log.warn("Couldn't create configuration file[" + base1Properties + "] for BASE 1 plugin");
-      if (log.isDebugEnabled()) log.debug("\t" + e);
+      log.warn("Couldn't create configuration file[" + base1Properties + "] for BASE 1 plugin: " + e.getMessage());
+      if (log.isDebugEnabled()) log.debug("", e);
     }
     catch (SQLException e)

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/WizzzardTransfer.java

@@ -96 +96 @@
       setCommonItemData(dc, pluginConfiguration, rs);
       PluginConfigurationRequest request = pluginConfiguration.configure();
+      // Always allow complex column mappings, just in case
+      request.setParameterValue("complexExpressions", "allow");
       
       String dataHeaderRegexp = fixRegexp(rs.getString(12));
@@ -124 +126 @@
           request.setParameterValue("minDataColumns", minDataColumns);
           request.setParameterValue("maxDataColumns", maxDataColumns);
+          // Always allow complex column mappings, just in case
+          request.setParameterValue("complexExpressions", "allow");
           // RawBioAssayData
           request.setParameterValue(
@@ -288 +292 @@
             "reporterIdColumnMapping", mappings.get("reporterId"));
         request.setParameterValue(
-            "symbolColumnMapping", mappings.get("geneSymbol"));
-        request.setParameterValue(
-            "nameColumnMapping", mappings.get("geneName"));
+            "blockColumnMapping", mappings.get("_r_block"));
+        request.setParameterValue(
+            "rowColumnMapping", mappings.get("_r_y"));
+        request.setParameterValue(
+            "columnColumnMapping", mappings.get("_r_x"));
       }
       else
@@ -319 +325 @@
     catch (BaseException e)
     {
-      log.warn("The wizzard [" + base1Properties + "] could not be transfered");
-      if (log.isDebugEnabled()) log.debug("\t" + e);
+      log.warn("The wizzard [" + base1Properties + "] could not be transfered:" + e.getMessage() );
+      if (log.isDebugEnabled()) log.debug("", e);
     }
     catch (SQLException e)