Changeset 26452

Timestamp:

2012-11-08T17:22:08+13:00 (11 years ago)

Author:

ak19

Message:

Recommitting with debug statement commented out. Previous commit 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/collConfigxml.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -314 +314 @@
     #@ Handling the option elements in an importOptions/buildOptions element, which are of the form:
     # <importOptions><option name="n" value="v"/><option .../></importOptions>
-    # these get stored in memory at the top level as (n, v) pairs, as in GS2
+    # these get stored in-memory at the top level as (n, v) pairs, just as in GS2
     elsif ($currentLevel =~ /$generalOptions/ and $element eq "option") {
     if (defined $name and $name =~ /\w/ and defined $value and $value =~ /\w/) {
         #$data->{$currentLevel}->{$name} = $value;
         $data->{$name} = $value;
-        print "@@@@ Added $currentLevel option: $name=$value\n";
+        #print "@@@@ Added $currentLevel option: $name=$value\n";
     }
     }