Changeset 26342 for main

Timestamp:

2012-10-18T14:19:00+13:00 (12 years ago)

Author:

kjdon

Message:

indexOption/option-list is now just indexOption-list

File:

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

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -80 +80 @@
 # ("plugin", "option")
 my $currentIndex = 0;
-my $arrayexp = q/^(index|level|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/;
+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
@@ -193 +193 @@
     #}
  
-    #@ Handle index|level|indexSubcollection|indexLanguage
+    #@ Handle index|level|indexOption|indexSubcollection|indexLanguage
     elsif ($element =~ /$arrayexp/) {
       my $key = $nameMap->{$element};   
@@ -211 +211 @@
 
     #@ indexoptions: accentfold/casefold/stem; arrayexp
-    elsif ($element eq "indexOption") {
-      $currentLevel = "indexOption";
-    }
-    if ($currentLevel eq "indexOption" and $element eq "option") {
-      my $key = $nameMap->{$currentLevel};  
-      if (!defined $data->{$key}) {
-    $data->{$key} = [];
-      }
-      push (@{$data->{$key}},$name);
-    }
+ #   elsif ($element eq "indexOption") {
+  #    $currentLevel = "indexOption";
+   # }
+   # if ($currentLevel eq "indexOption" and $element eq "option") {
+    #  my $key = $nameMap->{$currentLevel}; 
+     # if (!defined $data->{$key}) {
+#   $data->{$key} = [];
+ #     }
+  #    push (@{$data->{$key}},$name);
+   # }
     #@ plugout options
     elsif ($element eq "plugout") {