From: Shawn Boyette Date: Thu, 9 Jul 2009 13:56:41 +0000 (+0000) Subject: rescued changes X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=commitdiff_plain;h=8e27110f3aa0e93713398dcdd96bfb32a97ac721 rescued changes --- diff --git a/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm b/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm index ffe3591..9bce081 100644 --- a/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm +++ b/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm @@ -86,7 +86,7 @@ or Perl will think you're passing a (possibly malformed) octal value. =cut -sub has { my ($self, $t) = @_; $t =~ s/^0+//; return (defined $self->{tags}{$t}) ? 1 : 0 } +sub has { my ($self, $t) = @_; return 0 unless $t; $t =~ s/^0+//; return (defined $self->{tags}{$t}) ? 1 : 0 } =head2 as_hashref diff --git a/Equinox-Migration/lib/Equinox/Migration/SubfieldMapper.pm b/Equinox-Migration/lib/Equinox/Migration/SubfieldMapper.pm index 68a545c..a115ea4 100644 --- a/Equinox-Migration/lib/Equinox/Migration/SubfieldMapper.pm +++ b/Equinox-Migration/lib/Equinox/Migration/SubfieldMapper.pm @@ -9,11 +9,11 @@ Equinox::Migration::SubfieldMapper - Generate named-field to MARC tag map from f =head1 VERSION -Version 1.004 +Version 1.005 =cut -our $VERSION = '1.004'; +our $VERSION = '1.005'; =head1 SYNOPSIS @@ -230,7 +230,7 @@ sub generate { my $map = { mods => [], filt => [] }; $map->{field} = shift @tokens; $map->{tag} = shift @tokens; - while (my $tok = shift @tokens) { + while (defined (my $tok = shift @tokens)) { last if ($tok =~ m/^#/); if ($tok =~ m/^[a-z]:'/ and $tok !~ /'$/) { $tok .= ' ' . shift @tokens