Changeset 19619

Timestamp:

2009-05-27T13:58:48+12:00 (15 years ago)

Author:

kjdon

Message:

just look for a single mappign file, not for a list of them. collection version should override the main one. and use util::tidy_up_oid for assigned ids

File:

• gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm

@@ -117 +117 @@
     }
 
-    # read in the metadata mapping files
-    my $mm_files = &util::locate_config_files($self->{'metadata_mapping_file'}); 
-
-
-    if (scalar(@$mm_files)==0)
+    # read in the metadata mapping file
+    my $mm_file = &util::locate_config_file($self->{'metadata_mapping_file'}); 
+
+    if (! defined $mm_file)
     {
     my $msg = "MARCXMLPlugin ERROR: Can't locate mapping file \"" .
@@ -134 +133 @@
     }
     else {
-    $self->{'metadata_mapping'} = &marcmapping::parse_marc_metadata_mapping($mm_files, $outhandle);
+    $self->{'metadata_mapping'} = &marcmapping::parse_marc_metadata_mapping($mm_file, $outhandle);
     }
 
@@ -426 +425 @@
     if (defined $identifier && $identifier ne "") {
         $full_id = $identifier;
-        $full_id =~ s/\.//g; #remove any periods
-        if ($full_id =~ /^[\d]*$/) {
-        $full_id = "D" . $full_id;
-        print STDERR "OID only contains numbers, adding a D\n";
-        }
+        $full_id = &util::tidy_up_oid($full_id);
     }
     }