[open-ils-commits] r12874 - trunk/Open-ILS/src/extras/import (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2009-04-15 10:15:58 -0400 (Wed, 15 Apr 2009)
New Revision: 12874

Modified:
   trunk/Open-ILS/src/extras/import/marc2bre.pl
Log:
move the duplicate TCN test to /after/ the final attempt at TCN fixup

Modified: trunk/Open-ILS/src/extras/import/marc2bre.pl
===================================================================
--- trunk/Open-ILS/src/extras/import/marc2bre.pl	2009-04-15 03:20:32 UTC (rev 12873)
+++ trunk/Open-ILS/src/extras/import/marc2bre.pl	2009-04-15 14:15:58 UTC (rev 12874)
@@ -363,12 +363,6 @@
 		}
     }
 
-    if (!$tcn_value || exists $used_tcns{$tcn_value}) {
-		$tcn_source = 's';
-		$tcn_number = $id;
-		$tcn_value = $tcn_source.$tcn_number;
-    }
-
 	# special case to catch possibly passed in full OCLC numbers and those derived from the 001 field
 	if ($tcn_value =~ /^oc(m|n)(\d+)$/o) {
 		$tcn_source = 'o';
@@ -376,6 +370,14 @@
 		$tcn_value = $tcn_source.$tcn_number;
 	}
 
+    if (!$tcn_value || exists $used_tcns{$tcn_value}) {
+		$tcn_source = 's';
+		$tcn_number = $id;
+		$tcn_value = $tcn_source.$tcn_number;
+		$warn = 1
+    }
+
+
 	# expand $tcn_source from code letter to full name
 	$tcn_source = do { $tcn_source_map{$tcn_source} || 'Unknown' };