Changeset 26342 for main

Show
Ignore:
Timestamp:
18.10.2012 14:19:00 (7 years ago)
Author:
kjdon
Message:

indexOption/option-list is now just indexOption-list

Files:
1 modified

Legend:

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

    r24464 r26342  
    8080# ("plugin", "option") 
    8181my $currentIndex = 0; 
    82 my $arrayexp = q/^(index|level|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; 
     82my $arrayexp = q/^(index|level|indexOption|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; 
    8383my $arrayarrayexp= q/^(plugin|classifier)$/; #|buildOption)$/; 
    8484my $hashexp = q/^(subcollection)$/; # add other element names that should be represented by hash expressions here 
     
    193193    #} 
    194194  
    195     #@ Handle index|level|indexSubcollection|indexLanguage 
     195    #@ Handle index|level|indexOption|indexSubcollection|indexLanguage 
    196196    elsif ($element =~ /$arrayexp/) { 
    197197      my $key = $nameMap->{$element};    
     
    211211 
    212212    #@ indexoptions: accentfold/casefold/stem; arrayexp 
    213     elsif ($element eq "indexOption") { 
    214       $currentLevel = "indexOption"; 
    215     } 
    216     if ($currentLevel eq "indexOption" and $element eq "option") { 
    217       my $key = $nameMap->{$currentLevel};   
    218       if (!defined $data->{$key}) { 
    219     $data->{$key} = []; 
    220       } 
    221       push (@{$data->{$key}},$name); 
    222     } 
     213 #   elsif ($element eq "indexOption") { 
     214  #    $currentLevel = "indexOption"; 
     215   # } 
     216   # if ($currentLevel eq "indexOption" and $element eq "option") { 
     217    #  my $key = $nameMap->{$currentLevel};  
     218     # if (!defined $data->{$key}) { 
     219#   $data->{$key} = []; 
     220 #     } 
     221  #    push (@{$data->{$key}},$name); 
     222   # } 
    223223    #@ plugout options 
    224224    elsif ($element eq "plugout") {