X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=Equinox-Migration%2Flib%2FEquinox%2FMigration%2FMapDrivenMARCXMLProc.pm;h=8db9e7eef27fde2684240486b6d90b1b17a67004;hp=d78c5284066cce4759d3bf2e00fc236fa1311830;hb=f79126d237f658b9f09f28a19bdb7d57e7b327c6;hpb=69ca50f0514a2bf1626005925c134cb7e268556e

diff --git a/Equinox-Migration/lib/Equinox/Migration/MapDrivenMARCXMLProc.pm b/Equinox-Migration/lib/Equinox/Migration/MapDrivenMARCXMLProc.pm
index d78c528..8db9e7e 100644
--- a/Equinox-Migration/lib/Equinox/Migration/MapDrivenMARCXMLProc.pm
+++ b/Equinox-Migration/lib/Equinox/Migration/MapDrivenMARCXMLProc.pm
@@ -23,6 +23,7 @@ our $VERSION = '1.002';
 my $dstore;
 my $sfmap;
 my @mods = qw( multi bib required );
+my $multis = {};
 my $reccount;
 my $verbose = 0;
 
@@ -53,7 +54,7 @@ sub new {
 
     $verbose = 1 if $args{verbose};
 
-    my $self = bless { 
+    my $self = bless { multis => \$multis,
                      }, $class;
 
     # initialize map and taglist
@@ -65,7 +66,9 @@ sub new {
     die "Datastore file 'EMMXSSTORAGE.dbmd' already exists. Exiting.\n"
       if (-e "EMMXSSTORAGE.dbmd");
     $dstore = DBM::Deep->new( file => "EMMXSSTORAGE.dbmd",
-                              data_sector_size => 256 );
+                              data_sector_size => 256,
+                              autoflush => 0,
+                            );
     $reccount = 0;            # next record ptr
     $dstore->{tags} = $sfmap->tags; # list of all tags
     $self->{data} = $dstore;
@@ -134,8 +137,9 @@ sub process_field {
           { process_subs($tag, $sub, $crec) }
 
         # check map to ensure all declared tags and subs have a value
-        my $mods = $sfmap->mods($field);
         for my $mappedsub ( @{ $sfmap->subfields($tag) } ) {
+            my $fieldname = $sfmap->field($tag, $mappedsub);
+            my $mods = $sfmap->mods($fieldname);
             next if $mods->{multi};
             $crec->{tags}[-1]{uni}{$mappedsub} = ''
               unless defined $crec->{tags}[-1]{uni}{$mappedsub};
@@ -154,19 +158,20 @@ sub process_subs {
     # handle unmapped tag/subs
     return unless ($sfmap->has($tag, $code));
 
-    # fetch our datafield struct and fieldname
+    # fetch our datafield struct and fiel
     my $dataf = $crec->{tags}[-1];
     my $field = $sfmap->field($tag, $code);
-    $crec->{names}{$tag}{$code} = $field;
 
     # test filters
     for my $filter ( @{$sfmap->filters($field)} ) {
         return if ($sub->text =~ /$filter/i);
     }
+
     # handle multi modifier
     if (my $mods = $sfmap->mods($field)) {
         if ($mods->{multi}) {
             push @{$dataf->{multi}{$code}}, $sub->text;
+            $multis->{$tag}{$code} = 1;
             return;
         }
     }
@@ -210,13 +215,24 @@ sub recno { my ($self) = @_; return $self->{data}{rcnt} }
 
 =head2 name
 
-Returns mapped fieldname when passed a record number, tag, and code
+Returns mapped fieldname when passed a tag, and code
 
-    my $name = $m->name(3,999,'a');
+    my $name = $m->name(999,'a');
 
 =cut
 
-sub name { my ($self, $r, $t, $c) = @_; return $dstore->{recs}[$r]{names}{$t}{$c} };
+sub name { my ($self, $t, $c) = @_; return $sfmap->field($t, $c) }
+
+=head2 get_multis
+
+Returns hashref of C<{tag}{code}> for all mapped multi fields
+
+=cut
+
+sub get_multis {
+    my ($self) = @_;
+    return $multis;
+}
 
 =head1 MODIFIERS