From f9512f7355da9b31b67ebe7d9c5a80151b3fc49c Mon Sep 17 00:00:00 2001 From: Shawn Boyette Date: Tue, 11 Nov 2008 15:30:13 +0000 Subject: [PATCH] $recptr -> $ptr --- marc-cleanup | 120 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) diff --git a/marc-cleanup b/marc-cleanup index b25e323..0d222dc 100755 --- a/marc-cleanup +++ b/marc-cleanup @@ -16,7 +16,7 @@ populate_trash() if ($conf->{trash}); my @record = (); # current record storage my %recmeta = (); # metadata about current record -my $recptr = 0; # record index pointer +my $ptr = 0; # record index pointer my $input = shift || 'incoming.marc.xml'; @@ -59,32 +59,32 @@ while ( buildrecord() ) { do_automated_cleanups(); - $recptr = 0; - until ($recptr == $#record) { + $ptr = 0; + until ($ptr == $#record) { # naked ampersands - if ($record[$recptr] =~ /&/ && $record[$recptr] !~ /&\w+?;/) - { edit("Naked ampersand"); $recptr= 0; next } + if ($record[$ptr] =~ /&/ && $record[$ptr] !~ /&\w+?;/) + { edit("Naked ampersand"); $ptr= 0; next } # tags must be numeric - if ($record[$recptr] =~ //) { - if ($record[$recptr + 1] =~ m||) { - my @a = @record[0 .. $recptr - 1]; - my @b = @record[$recptr + 2 .. $#record]; + if ($record[$ptr] =~ m//) { + if ($record[$ptr + 1] =~ m||) { + my @a = @record[0 .. $ptr - 1]; + my @b = @record[$ptr + 2 .. $#record]; @record = (@a, @b); message("Empty datafield scrubbed"); - $recptr = 0; + $ptr = 0; next; } } # and quasi-empty subfields - if ($record[$recptr] =~ m|(.*?)(.*?)(.+?)|) { + if ($record[$ptr] =~ m|(.+?)|) { my $leader = $1; if (length $leader < 24) { $leader .= ' ' x (20 - length($leader)); $leader .= "4500"; - $record[$recptr] = "$leader\n"; + $record[$ptr] = "$leader\n"; message("Short leader padded"); } } - if ($record[$recptr] =~ m|(.+?)(.+?)$content\n"; + $record[$ptr] = "$content\n"; message("Short 008 padded"); } } # clean misplaced dollarsigns - if ($record[$recptr] =~ m|c?\d+\.\d{2}|) { - $record[$recptr] =~ s|"\$">c?(\d+\.\d{2})|"c">\$$1|; + if ($record[$ptr] =~ m|c?\d+\.\d{2}|) { + $record[$ptr] =~ s|"\$">c?(\d+\.\d{2})|"c">\$$1|; message("Dollar sign corrected"); } # clean up tags with spaces in them - $record[$recptr] =~ s/tag=" /tag="00/g; - $record[$recptr] =~ s/tag=" /tag="0/g; - $record[$recptr] =~ s/tag="-/tag="0/g; - $record[$recptr] =~ s/tag="(\d\d) /tag="0$1/g; + $record[$ptr] =~ s/tag=" /tag="00/g; + $record[$ptr] =~ s/tag=" /tag="0/g; + $record[$ptr] =~ s/tag="-/tag="0/g; + $record[$ptr] =~ s/tag="(\d\d) /tag="0$1/g; # stow tag data if we're looking at it - if ($record[$recptr] =~ m//) { + if ($record[$ptr] =~ m//) { $recmeta{tag} = $1; $recmeta{ind1} = $2; $recmeta{ind2} = $3; } # automatable subfield maladies - $record[$recptr] =~ s/code=" ">c/code="c">/; - $record[$recptr] =~ s/code=" ">\$/code="c"$>/; + $record[$ptr] =~ s/code=" ">c/code="c">/; + $record[$ptr] =~ s/code=" ">\$/code="c"$>/; } } @@ -191,7 +191,7 @@ sub edit { print_context(); # stow original problem line - $conf->{origline} = $record[$recptr]; + $conf->{origline} = $record[$ptr]; while (1) { my $line = $term->readline('marc-cleanup>'); @@ -204,7 +204,7 @@ sub edit { my $term = $commands{$chunks[0]}->(@chunks[1..$#chunks]); last if $term; } else { - $record[$recptr] = "$line\n"; + $record[$ptr] = "$line\n"; print_linecontext(); } } @@ -289,10 +289,10 @@ sub print_context { } sub print_linecontext { - my $low = ($recptr - 3 < 0) ? 0 : $recptr - 3; - print $OUT ' |', $record[$_] for ($low .. $recptr - 1); - print $OUT '==> |', $record[$recptr]; - print $OUT ' |', $record[$recptr + 1], "\n"; + my $low = ($ptr - 3 < 0) ? 0 : $ptr - 3; + print $OUT ' |', $record[$_] for ($low .. $ptr - 1); + print $OUT '==> |', $record[$ptr]; + print $OUT ' |', $record[$ptr + 1], "\n"; return 0; } @@ -329,25 +329,25 @@ sub substitute { $from = join('', $from, $char); } - $conf->{prevline} = $record[$recptr]; - $record[$recptr] =~ s/$from/$to/; + $conf->{prevline} = $record[$ptr]; + $record[$ptr] =~ s/$from/$to/; print_linecontext(); return 0; } sub merge_lines { - $conf->{prevline} = $record[$recptr]; + $conf->{prevline} = $record[$ptr]; # remove //; + $record[$ptr] =~ s/^\s*//; # and move to front of line - $record[$recptr] = join(' ', $1 , $record[$recptr]); + $record[$ptr] = join(' ', $1 , $record[$ptr]); # tear off trailing subfield tag from preceeding line - $record[$recptr - 1] =~ s|\n||; + $record[$ptr - 1] =~ s|\n||; # join current line onto preceeding line - $record[$recptr - 1] = join('', $record[$recptr - 1], $record[$recptr]); + $record[$ptr - 1] = join('', $record[$ptr - 1], $record[$ptr]); # erase current line - my @a = @record[0 .. $recptr - 1]; - my @b = @record[$recptr + 1 .. $#record]; + my @a = @record[0 .. $ptr - 1]; + my @b = @record[$ptr + 1 .. $#record]; @record = (@a, @b); # move record pointer to previous line prev_line(); @@ -356,25 +356,25 @@ sub merge_lines { } sub flip_line { - my $temp = $record[$recptr]; - $record[$recptr] = $conf->{prevline}; + my $temp = $record[$ptr]; + $record[$ptr] = $conf->{prevline}; $conf->{prevline} = $temp; print_linecontext(); return 0; } sub kill_line { - $conf->{prevline} = $record[$recptr]; - my @a = @record[0 .. $recptr - 1]; - my @b = @record[$recptr + 1 .. $#record]; + $conf->{prevline} = $record[$ptr]; + my @a = @record[0 .. $ptr - 1]; + my @b = @record[$ptr + 1 .. $#record]; @record = (@a, @b); print_linecontext(); return 0; } sub yank_line { - my @a = @record[0 .. $recptr - 1]; - my @b = @record[$recptr .. $#record]; + my @a = @record[0 .. $ptr - 1]; + my @b = @record[$ptr .. $#record]; @record = (@a, $conf->{prevline}, @b); print_linecontext(); return 0; @@ -394,13 +394,13 @@ sub dump_record { } sub next_line { - $recptr++; + $ptr++; print_linecontext(); return 0; } sub prev_line { - $recptr--; + $ptr--; print_linecontext(); return 0; } -- 1.7.2.5