X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=unicorn%2Funicorn_patrons_to_tsv.pl;h=94c03dd6e27f84394e30dd5bcae2312de00870ff;hp=a5566108e03b5f4bf717eb85bdd9ef61fc50ad6c;hb=b92ef7c84d4fb13b28c63a138f4ab1ca67cff81c;hpb=4fdba17226a6cc7722c5705a15fed702139c5b82

diff --git a/unicorn/unicorn_patrons_to_tsv.pl b/unicorn/unicorn_patrons_to_tsv.pl
index a556610..94c03dd 100755
--- a/unicorn/unicorn_patrons_to_tsv.pl
+++ b/unicorn/unicorn_patrons_to_tsv.pl
@@ -124,9 +124,10 @@ for (my $u = 0; $u < @records; $u++) {
 			$records[$u]{'l_' . $a . '_' . $f} = $records[$u]{uc('USER_' . $a . '.' . $f)};
 		}
 		$records[$u]{'l_' . $a . '_std_line1'} = $records[$u]{'USER_' . uc($a) . '.STREET'};
-		if ((defined $records[$u]{'USER_' . uc($a) . '.CITY/STATE'}) && ($records[$u]{'USER_' . uc($a) . '.CITY/STATE'} =~ m/^(.*), (.*)$/)) {
+		$records[$u]{'l_' . $a . '_std_line2'} = $records[$u]{'USER_' . uc($a) . '.LINE2'};
+		if ((defined $records[$u]{'USER_' . uc($a) . '.CITY/STATE'}) && ($records[$u]{'USER_' . uc($a) . '.CITY/STATE'} =~ m/^(.*),?(\s+)(.*)$/)) {
 			$records[$u]{'l_' . $a . '_std_city'} = $1;
-			$records[$u]{'l_' . $a . '_std_state'} = $2;
+			$records[$u]{'l_' . $a . '_std_state'} = $3;
 		}
 		$records[$u]{'l_' . $a . '_std_zip'} = $records[$u]{'USER_' . uc($a) . '.ZIP'};
 
@@ -160,8 +161,8 @@ for (my $u = 0; $u < @records; $u++) {
 	$records[$u]{'l_userid_active'} = '';
 	$records[$u]{'l_inactive_barcode1'} = $records[$u]{'USER_XINFO.PREV_ID'};
 	$records[$u]{'l_inactive_barcode2'} = $records[$u]{'USER_XINFO.PREV_ID2'};
-	$records[$u]{'l_user_category1'} = $records[$u]{'USER_ROUTING_FLAG'};
-	$records[$u]{'l_user_category2'} = $records[$u]{'USER_WEB_AUTH'};
+#	$records[$u]{'l_user_category1'} = $records[$u]{'USER_ROUTING_FLAG'};
+#	$records[$u]{'l_user_category2'} = $records[$u]{'USER_WEB_AUTH'};
 
 	# We can parse the name like so: