Changeset 26451 for main/trunk/greenstone2/perllib/inexport.pm

Timestamp:

2012-11-08T17:19:02+13:00 (12 years ago)

Author:

ak19

Message:

1. Fixed processing of the collectionconfig's indexOption element. 2. Correct set of changes for processing the new toplevel importOptions and buildOptions elements of collectionConfig.xml (which can contain such options as specify OIDtype, OIDmetadata, verbosity). 3. Undoing previous commits, since the importOptions and buildOptions elememts are not nested inside plugins but are one of the toplevel elements of collectionConfig.xml. And do not need the recently-committed changes to inexport.pm either, since any command line args for import and buildOptions will override what's in collectionConfig.xml anyway.

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/inexport.pm

@@ -228 +228 @@
     }
 
-    # 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'};