Changeset 26452 for main

Show
Ignore:
Timestamp:
08.11.2012 17:22:08 (7 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/collConfigxml.pm

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