Changeset 26450 for main/trunk/greenstone2

Timestamp:

2012-11-07T20:42:12+13:00 (11 years ago)

Author:

ak19

Message:

1. Added GS3 colconfig.xml processing of any OIDtype and OIDmetadata options specified (under new element importOptions) in collectionConfig.xml 2. Any OIDtype and/or OIDmetadata options provided to import.pl on the commandline still override what's in the collectionConfig.xml. Note: as these are not to be written back out to the collectionConfig file, buildcol.pl (which does not take either as argument) will have no recollection of either of these options specified as cmdline arguments to import.pl, and can at best consult whatever may be in collectionConfig.xml

Location:

main/trunk/greenstone2/perllib

Files:

• collConfigxml.pm (modified) (4 diffs)
• inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -75 +75 @@
 my $currentAttrRef = undef; 
 
+# for storing plugin options if of type importOptions or buildOptions
+my $currentPluginOptionsType = undef; # can be import or build
+
 my $currentLevel = "";
 
@@ -277 +280 @@
       }
     
+    # need to process the options of any build- and importOptions lists inside a plugin
+    # <pluginList><plugin><option.../><option.../><importOptions><option .../></importOptions></plugin></pluginList>
+    elsif ($currentLevel eq "plugin" and $element =~ m/^(importOptions|buildOptions)$/) {
+    if($element eq "importOptions") {
+        $currentPluginOptionsType="import";
+    }
+    else {
+        $currentPluginOptionsType="build";
+    }
+    }
+
     #@ Handling the option elements in each classifier/plugin element (as the following strings)
     elsif ($currentLevel =~ /$arrayarrayexp/ and $element eq "option") {
@@ -288 +302 @@
             push (@{$data->{$key}->[$currentIndex]}, $value);
     }
+    # besides regular options, plugins can have buildOptions and importOptions
+    #if (defined $currentPluginOptionsType and $currentPluginOptionsType =~ /\w/) {
+            #push (@{$data->{$key}->[$currentIndex]}, $currentPluginOptionsType);
+        ##print "@@@@ Found $currentPluginOptionsType option with name: $name and value: $value\n";
+    #}
 
     }
@@ -300 +319 @@
         $currentLevel = "";
     }
+    elsif ($element =~ m/^(importOptions|buildOptions)$/) { # can be nested inside a plugin of pluginList
+    $currentPluginOptionsType = undef;
+    }
+
     # $arrayarrayexp contains classifier|plugin
     elsif($element =~ /$arrayarrayexp/ ){

main/trunk/greenstone2/perllib/inexport.pm

@@ -227 +227 @@
     $collectcfg->{'infodbtype'} = "gdbm";
     }
+
+    # if OIDtype and/or OIDmetadata args are specified on the commandline, they override what's
+    # in collectcfg but may not overwrite it (by writing it into the collectcfg file)
+    if (defined $self->{'OIDtype'} && $self->{'OIDtype'} =~ /\w/)
+    {
+    $collectcfg->{'OIDtype'} = $self->{'OIDtype'}; # store in the in-memory collectcfg hash
+    }
+    if (defined $self->{'OIDmetadata'} && $self->{'OIDmetadata'} =~ /\w/)
+    {
+    $collectcfg->{'OIDmetadata'} = $self->{'OIDmetadata'}; # store in the in-memory collectcfg hash
+    }    
+
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {
     $importdir = $collectcfg->{'importdir'};