strip lead and trailing spaces from some fields

[migration-tools.git] / unicorn_patron_xml2text.pl

diff --git a/unicorn_patron_xml2text.pl b/unicorn_patron_xml2text.pl
index fcaaedf..5328d57 100755 (executable)
--- a/unicorn_patron_xml2text.pl
+++ b/unicorn_patron_xml2text.pl
@@ -62,13 +62,13 @@ print STDOUT join("\t", @base_elements);
 foreach my $addr ( 1..3 ) {
     print STDOUT "\t" . join("\t", @addr_elements);
 }
-print STDOUT "\tinactive_barcode1\tinactive_barcode2";
+print STDOUT "\tuserid_active\tinactive_barcode1\tinactive_barcode2";
 print STDOUT "\n";
 
 for my $patron ( $doc->documentElement->childNodes ) {
        next if ($patron->nodeType == 3);
 
-       my $bc = $patron->findvalue( 'user_id' );
+       my $bc = $patron->findvalue( 'user_id' ); $bc =~ s/^\s+//; $bc =~ s/\s+$//;
        if (exists($s_map{$bc})) {
                $count++;
                warn "\n!!! already saw barcode $bc, skipping\n";
@@ -85,7 +85,7 @@ for my $patron ( $doc->documentElement->childNodes ) {
        }
 
     foreach my $e ( @base_elements ) {
-        my $v = $patron->findvalue( $e );
+        my $v = $patron->findvalue( $e ); $v =~ s/^\s+//; $v =~ s/\s+$//;
         if ( $v && ( $e eq 'birthdate' || $e eq 'user_priv_granted' || $e eq 'user_priv_expires' ) ) { $v = parse_date($v); }
         print STDOUT ( $v ? $v : '' ) . "\t";
     }
@@ -100,7 +100,7 @@ for my $patron ( $doc->documentElement->childNodes ) {
     foreach my $t ( 1..3 ) {
         if ($addresses{$t}) {
             foreach my $e ( @addr_elements ) {
-                my $v = $addresses{$t}->findvalue( $e );
+                my $v = $addresses{$t}->findvalue( $e ); $v =~ s/^\s+//; $v =~ s/\s+$//;
                 print STDOUT ( $v ? $v : '' ) . "\t";
             }
         } else {
@@ -110,22 +110,30 @@ for my $patron ( $doc->documentElement->childNodes ) {
 
     my $inactive_barcode1 = '';
     my $inactive_barcode2 = '';
+    my $userid_active = 't';
     my @barcodes = $patron->findnodes( "barcodes" );
     for my $i_bc ( $barcodes[0]->findnodes( "barcode" ) ) {
         my $active = $i_bc->getAttribute('active');
-        if ($active eq "0") {
+        if ($active eq "0" && $i_bc->textContent eq $bc) {
+            $userid_active = 'f';
+        }
+        if ($active eq "0" && $i_bc->textContent ne $bc) {
             if (! $inactive_barcode1 ) {
                 $inactive_barcode1 = $i_bc->textContent;
+                $inactive_barcode1 =~ s/^\s+//;
+                $inactive_barcode1 =~ s/\s+$//;
             } else {
                 if (! $inactive_barcode2 ) {
                     $inactive_barcode2 = $i_bc->textContent;
+                    $inactive_barcode2 =~ s/^\s+//;
+                    $inactive_barcode2 =~ s/\s+$//;
                 } else {
                     warn "Extra barcode (" . $i_bc->textContent . ") for user with id = " . $bc . "\n";
                 }
             }
         }
     }
-    print STDOUT "$inactive_barcode1\t$inactive_barcode2";
+    print STDOUT "$userid_active\t$inactive_barcode1\t$inactive_barcode2";
 
     print STDOUT "\n";
        $count++;