Changeset 4036


Ignore:
Timestamp:
Dec 5, 2007, 9:39:17 AM (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/clients/migrate/net/sf/basedb/clients/migrate/PluginTransfer.java

    r3683 r4036  
    182182    catch (BaseException e)
    183183    {
    184       log.warn("Couldn't create configuration file[" + base1Properties + "] for BASE 1 plugin");
    185       if (log.isDebugEnabled()) log.debug("\t" + e);
     184      log.warn("Couldn't create configuration file[" + base1Properties + "] for BASE 1 plugin: " + e.getMessage());
     185      if (log.isDebugEnabled()) log.debug("", e);
    186186    }
    187187    catch (SQLException e)
  • trunk/src/clients/migrate/net/sf/basedb/clients/migrate/WizzzardTransfer.java

    r3683 r4036  
    9696      setCommonItemData(dc, pluginConfiguration, rs);
    9797      PluginConfigurationRequest request = pluginConfiguration.configure();
     98      // Always allow complex column mappings, just in case
     99      request.setParameterValue("complexExpressions", "allow");
    98100     
    99101      String dataHeaderRegexp = fixRegexp(rs.getString(12));
     
    124126          request.setParameterValue("minDataColumns", minDataColumns);
    125127          request.setParameterValue("maxDataColumns", maxDataColumns);
     128          // Always allow complex column mappings, just in case
     129          request.setParameterValue("complexExpressions", "allow");
    126130          // RawBioAssayData
    127131          request.setParameterValue(
     
    288292            "reporterIdColumnMapping", mappings.get("reporterId"));
    289293        request.setParameterValue(
    290             "symbolColumnMapping", mappings.get("geneSymbol"));
    291         request.setParameterValue(
    292             "nameColumnMapping", mappings.get("geneName"));
     294            "blockColumnMapping", mappings.get("_r_block"));
     295        request.setParameterValue(
     296            "rowColumnMapping", mappings.get("_r_y"));
     297        request.setParameterValue(
     298            "columnColumnMapping", mappings.get("_r_x"));
    293299      }
    294300      else
     
    319325    catch (BaseException e)
    320326    {
    321       log.warn("The wizzard [" + base1Properties + "] could not be transfered");
    322       if (log.isDebugEnabled()) log.debug("\t" + e);
     327      log.warn("The wizzard [" + base1Properties + "] could not be transfered:" + e.getMessage() );
     328      if (log.isDebugEnabled()) log.debug("", e);
    323329    }
    324330    catch (SQLException e)
Note: See TracChangeset for help on using the changeset viewer.