Changeset 16968

Timestamp:

2008-08-22T15:07:29+12:00 (16 years ago)

Author:

kjdon

Message:

added two options - collection, used to set gsdlcollectdir if specified, so that collection specific files can be used; plugin_options, used to add options to pass to the plugin (eg metadata_mapping_file for MARCPlugin. Also fixed two bugs found with documents_directory being empty for every record except for when a new directory is created, and misnamed function call

File:

• gsdl/trunk/bin/script/explode_metadata_database.pl (modified) (7 diffs)

gsdl/trunk/bin/script/explode_metadata_database.pl

@@ -15 +15 @@
 use printusage;
 use parse2;
+use colcfg;
+
 use FileHandle;
 
@@ -80 +82 @@
     'deft' => "100",
     'reqd' => "no" },
+      { 'name' => "plugin_options",
+    'desc' => "options for the plugin",
+    'type' => "string",
+    'reqd' => "no",
+    'modegli' => "3"},
+      { 'name' => "collection",
+    'desc' => "collection for file",
+    'type' => "string",
+    'reqd' => "no",
+    'modegli' => "3"},
       { 'name' => "verbosity",
     'desc' => "{import.verbosity}",
@@ -103 +115 @@
 {
     my ($language, $input_encoding, $metadata_set, $plugin, 
-    $document_field, $document_prefix, $document_suffix, $records_per_folder, $verbosity);
+    $document_field, $document_prefix, $document_suffix, $records_per_folder, $plugin_options, $collection, $verbosity);
 
     my $xml = 0;
@@ -169 +181 @@
     $metadata_set = "";
     }
-
+    if (defined $collection && $collection =~ /\w/) {
+    if (($collection = &colcfg::use_collection("", $collection, "")) eq "") {
+        print STDERR "Collection $collection does not exist\n";
+        die "\n";
+    }
+    }
+    
     my $plugobj;
     require "$plugin.pm";
-    eval ("\$plugobj = new $plugin()");
-    die "$@" if $@;
-
+
+    if (defined $plugin_options && $plugin_options =~ /\w/) {
+    my @options = split(/\s/, $plugin_options);
+    map { $_ = "\"$_\"" unless $_ =~ /^\"/; } @options;
+    $plugin_options = join (",", @options);
+    eval ("\$plugobj = new $plugin([], [$plugin_options])");
+    die "$@" if $@;
+    } else {
+    eval ("\$plugobj = new $plugin()");
+    die "$@" if $@;
+    }
     # ...and initialize it
-    $plugobj->init(1, "STDERR", "STDERR");
-    
+    $plugobj->init($verbosity, "STDERR", "STDERR");
+
     if ($input_encoding eq "auto") {
     ($language, $input_encoding) = $plugobj->textcat_get_language_encoding ($filename);
-    }
+    }       
 
     # Create a directory to store the document files...
@@ -205 +231 @@
     # Write the metadata from each record to the metadata.xml file
     my $record_number = 1;
+    my $documents_directory;
     foreach my $record_text (@metadata_records) {
         
         # Check if we need to start a new directory for these records
-        my $documents_directory;
         check_need_new_directory($exploded_base_dir,$record_number,$records_per_folder,
                      \@metadata_records,\$documents_directory);
-        
         # Use the plugin's process function to avoid duplicating code
         my $doc_obj = new doc($filename, "nonindexed_doc");
@@ -219 +244 @@
         # Try to get a doc to attach the metadata to
         # If no match found, create a dummy .nul file
-        attach_metadata_or_nul_doc($document_field, $doc_obj, $record_number,
+        attach_metadata_or_make_nul_doc($document_field, $doc_obj, $record_number,
                        $documents_directory, $orig_base_dir,
                        $document_prefix, $document_suffix, $metadata_set, $verbosity);
@@ -356 +381 @@
         $document_file = "doc.nul";
     }
-
     open(DUMMY_FILE, ">$documents_directory/$document_file");
     close(DUMMY_FILE);