Eliminating one line of Perl 5.10 dependency

[migration-tools.git] / marc_cleanup

diff --git a/marc_cleanup b/marc_cleanup
index 53801f3..3b2c2ed 100755 (executable)
--- a/marc_cleanup
+++ b/marc_cleanup
@@ -92,12 +92,12 @@ while ( buildrecord() ) {
         }
 
         # subfields can't be non-alphanumeric
-        #if ($record[$ptr] =~ /<subfield code="(.*?)"/) {
-            #if ($1 =~ /\P{IsAlnum}/ or $1 eq '') {
-                #edit("Junk in subfield code/Null subfield code");
-                #next;
-            #}
-        #}
+        if ($record[$ptr] =~ /<subfield code="(.*?)"/) {
+            if ($1 =~ /\P{IsAlnum}/ or $1 eq '') {
+                edit("Junk in subfield code/Null subfield code");
+                next;
+            }
+        }
         # subfields can't be non-alphanumeric
         if ($record[$ptr] =~ /<subfield code="(\w{2,})"/) {
             edit("Subfield code larger than 1 char");
@@ -186,13 +186,13 @@ sub do_automated_cleanups {
 sub stow_record_data {
     # get tag data if we're looking at it
     my $tag = 0;
-    if ($record[$ptr] =~ m/<(control|data)field tag="(?<TAG>.{3})"/) {
-        $recmeta{tag} = $+{TAG};
+    if ($record[$ptr] =~ m/<(control|data)field tag="(.{3})"/) {
+        $recmeta{tag} = $1;
         $tag = $recmeta{tag};
-        $record[$ptr] =~ m/ind1="(?<IND1>.)"/;
-        $recmeta{ind1} = $+{IND1} || '';
-        $record[$ptr] =~ m/ind2="(?<IND2>.)"/;
-        $recmeta{ind2} = $+{IND2} || '';
+        $record[$ptr] =~ m/ind1="(.)"/;
+        $recmeta{ind1} = $1 || '';
+        $record[$ptr] =~ m/ind2="(.)"/;
+        $recmeta{ind2} = $1 || '';
 
         unless ($tag) {
             message("Autokill record: no detectable tag");
@@ -603,7 +603,7 @@ sub initialize {
     show_trashhelp() if ($c->{trashhelp});
 
     # defaults
-    my $pfx = $c->{prefix} // "bibs";
+    my $pfx = defined($c->{prefix}) ? $c->{prefix} : "bibs";
     $c->{ricount} = 0;
     $c->{rocount} = 0;
     $c->{'renumber-tag'} = 903 unless defined $c->{'renumber-tag'};
@@ -641,7 +641,7 @@ Options
   --output     -o  Cleaned MARCXML output filename
   --exception  -x  Exception (dumped records) MARCXML filename
        or
-  --prefix=<PREFIX>>   -p  Shared prefix for output/exception files. Will produce
+  --prefix=<PREFIX>    -p  Shared prefix for output/exception files. Will produce
                            PREFIX.clean.marc.xml and PREFIX.exception.marc.xml
 
   --marcfile  -m  Input filename. Defaults to PREFIX.marc.xml