Changeset 3634

Timestamp:

Aug 6, 2007, 2:48:44 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #573: Trim whitespace when checking for unique values

File:

• trunk/src/clients/migrate/net/sf/basedb/clients/migrate/ReporterTransfer.java (modified) (7 diffs)

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

@@ -71 +71 @@
   
   /**
+    Maps BASE 1 reporters that are considered duplicate by BASE 2 after
+    whitespace has been trimmed from the external ID. Only used temporary until the
+    reporterMap is generated. Map contain BASE 1 ID --> Base 1 ID where the value
+    is the "real" reporter that is migrated to BASE 2.
+  */
+  private Map<Integer, Integer> duplicates = null;
+  
+  /**
     Used for inserting reporter into Base 2.
   */
@@ -102 +110 @@
 
     externalIdMap = new HashMap<String, Integer>(count);
+    duplicates = new HashMap<Integer, Integer>();
     DbControl dc = newDbControl();
     try
@@ -120 +129 @@
       if (dc != null) dc.close();
       externalIdMap.clear();
+      duplicates.clear();
       progress.stop();
     }
@@ -152 +162 @@
         rowCount++;
         ReporterData item = createDataItem(rs);
-        batcher.insert(item);
+        if (item != null) batcher.insert(item);
         progress.increase();
         if (log.isDebugEnabled())
@@ -195 +205 @@
       {
         ReporterData reporter = result.next();
-        reporterMap.put(externalIdMap.get(reporter.getExternalId()), new ReporterProxy(reporter));
+        Integer base1Id = externalIdMap.get(reporter.getExternalId());
+        reporterMap.put(base1Id, new ReporterProxy(reporter));
         rowCount++;
         progress.increase();
         if (log.isDebugEnabled())
         {
-          log.debug("Reporter: " + reporter.getExternalId() + " has been mapped");
+          log.debug("Reporter: " + reporter.getExternalId() + 
+            " has been mapped to BASE 1 ID="+base1Id);
+        }
+      }
+      
+      // Map duplicates
+      for (Map.Entry<Integer, Integer> entry : duplicates.entrySet())
+      {
+        Integer base1Id = entry.getKey();
+        Integer migratedBase1Id = entry.getValue();
+        ReporterData migratedReporter = reporterMap.get(migratedBase1Id);
+        reporterMap.put(base1Id, migratedReporter);
+        if (log.isDebugEnabled())
+        {
+          log.debug("Reporter: " + migratedReporter.getExternalId() + 
+            " has been mapped to BASE 1 ID=" + base1Id);
         }
       }
@@ -221 +247 @@
   
   @param rs <code>ResultSet</code> containing the data for this item.
-  @return <code>ReporterData</code>
+  @return <code>ReporterData</code> or null if another reporter with same ID has already been created
   @throws BaseException
   @throws SQLException If current ResultSet position is invalid or number
@@ -230 +256 @@
   {
     // Populate a new ReporterData object   
-    String externalId = rs.getString(2);
-    ReporterData rd = Reporter.getNew(externalId);
-    if (log.isDebugEnabled())
-    {
-      log.debug("Transfering Reporter BASE1 id(" + rs.getInt(1) + ")\texternal Id(" + externalId + ")");
-    }
-    externalIdMap.put(externalId, rs.getInt(1));
-    if (!QUICK_TRANSFER)
-    {
-      String name = rs.getString(3);
-      if (name == null || "".equals(name)) name = externalId;
-      rd.setName(name);
-      rd.setSymbol(rs.getString(4));
-      int columnIndex = 5;
-      for (String property : stringProperties)
-      {
-        rd.setExtended(property, rs.getString(columnIndex));
-        columnIndex++;
-      }
-      // Set integer properties, integer properties should be listed
-      // last(after the string properties) in the select statement
-      String[] intProperties = { "length" };
-      for (String property : intProperties)
-      {
-        rd.setExtended(property, rs.getInt(columnIndex));
-        columnIndex++;
-      }
-    }   
+    String externalId = rs.getString(2).trim();
+    int base1Id = rs.getInt(1);
+    ReporterData rd = null;
+    if (externalIdMap.containsKey(externalId))
+    {
+      Integer migratedBase1Id = externalIdMap.get(externalId);
+      log.warn("Duplicate reporter found in BASE 1 after trimming whitespace: id=" + 
+        base1Id + "; externald ID=" + externalId + "; Merging this reporter with reporter id="+ 
+        migratedBase1Id);
+      duplicates.put(base1Id, migratedBase1Id);
+    }
+    else
+    {
+      externalIdMap.put(externalId, base1Id);
+      if (log.isDebugEnabled())
+      {
+        log.debug("Transfering Reporter BASE1 id(" + base1Id + ")\texternal Id(" + externalId + ")");
+      }
+      rd = Reporter.getNew(externalId);
+      if (!QUICK_TRANSFER)
+      {
+        String name = rs.getString(3);
+        if (name == null || "".equals(name)) name = externalId;
+        rd.setName(name);
+        rd.setSymbol(rs.getString(4));
+        int columnIndex = 5;
+        for (String property : stringProperties)
+        {
+          rd.setExtended(property, rs.getString(columnIndex));
+          columnIndex++;
+        }
+        // Set integer properties, integer properties should be listed
+        // last(after the string properties) in the select statement
+        String[] intProperties = { "length" };
+        for (String property : intProperties)
+        {
+          rd.setExtended(property, rs.getInt(columnIndex));
+          columnIndex++;
+        }
+      }
+    }
     return rd;
   }