Changeset 27097 for main/trunk

Timestamp:

2013-03-19T13:39:28+13:00 (11 years ago)

Author:

kjdon

Message:

indexOption doesn't have sub element option any more

File:

• main/trunk/greenstone2/perllib/collConfigxml.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -81 +81 @@
 # ("plugin", "option")
 my $currentIndex = 0;
-my $arrayexp = q/^(index|level|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; # |indexOption
+my $arrayexp = q/^(index|level|indexOption|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; 
 my $arrayarrayexp = q/^(plugin|classifier)$/; #|buildOption)$/;
 my $hashexp = q/^(subcollection)$/; # add other element names that should be represented by hash expressions here
@@ -196 +196 @@
     #}
  
-    #@ Handle index|level|indexSubcollection|indexLanguage #|indexOption
+    #@ Handle index|level|indexOption|indexSubcollection|indexLanguage 
     elsif ($element =~ /$arrayexp/) {
       my $key = $nameMap->{$element};   
@@ -211 +211 @@
         $data->{$name} = $value;
     }    
-
-
-    #@ indexoptions: accentfold/casefold/stem; arrayexp
-    # needs a separate section, since unlike other $arrayexp, indexOption has <option>s as child elements 
-    # but should be stored in-memory different from $generalOptions (<buildOptions> and <importOptions>)
-    elsif ($element eq "indexOption") {
-      $currentLevel = "indexOption";
-      # find the gs2 mapping name
-      my $key = $nameMap->{$currentLevel};  
-      if (!defined $data->{$key}) {
-    $data->{$key} = [];
-      }
-    }
-    elsif ($currentLevel eq "indexOption" and $element eq "option") {
-      my $key = $nameMap->{$currentLevel};  
-      if (defined $name and $name =~ /\w/) {
-      push (@{$data->{$key}},$name);
-      }
-    }
 
     #@ plugout options