Changeset 24464 for main/trunk/greenstone2/perllib/collConfigxml.pm

Timestamp:

2011-08-24T16:21:08+12:00 (13 years ago)

Author:

davidb

Message:

Support for orthogonal build types (such as audioDB)

File:

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

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -57 +57 @@
            "languageMetadata" => "languagemetadata",
            "buildType" => "buildtype",
-           "buildOption" => "buildOption"
+           "orthogonalBuildTypes" => "orthogonalbuildtypes",
+           "buildOption" => "buildOption"
            };
 # A hash structure which is returned by sub read_cfg_file.
@@ -79 +80 @@
 # ("plugin", "option")
 my $currentIndex = 0;
-my $arrayexp = q/^(index|level|indexSubcollection|indexLanguage)$/;
+my $arrayexp = q/^(index|level|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
@@ -129 +130 @@
     my $value = $_{'value'};
     my $type = $_{'type'};
+    my $orthogonal = $_{'orthogonal'};
 
     # for subcollections
@@ -169 +171 @@
     
     #@ Handling indexer: mgpp/mg/lucene; stringexp
+    #@ Handling orthogonal indexers: audioDB; arrayexp
     elsif ($element eq "search") {
-      $data->{'buildtype'} = $type;
+    if ((defined $orthogonal) && ($orthogonal =~ m/^(true|on|1)$/i)) {
+        push(@{$data->{'orthogonalbuildtypes'}},$type);
+    }
+    else {
+        $data->{'buildtype'} = $type;
+    }
     }
     
-    elsif ($element eq "store_metadata_coverage")
-    {
-        print STDERR "*&*&*&*&*& HERE &*&*&*&*&*&*";
-      $data->{'store_metadata_coverage'} = $value;
-    }
+    elsif ($element eq "store_metadata_coverage")
+    {
+##  print STDERR "*&*&*&*&*& HERE &*&*&*&*&*&*";
+    $data->{'store_metadata_coverage'} = $value;
+    }
 
     #@ Handling searchtype: plain,form; arrayexp
@@ -363 +371 @@
     print STDERR "*** default level: ".$data->{"defaultlevel"}."\n" if (defined $data->{"defaultlevel"});
     print STDERR "*** build type: ".$data->{"buildtype"}."\n" if (defined $data->{"buildtype"});
+    print STDERR "*** orthogonal build types: ".join(",",$data->{"orthogonalbuildtypes"})."\n" if (defined $data->{"orthogonalbuildtypes"});
     print STDERR "*** search types: \n";
     print STDERR join(",",@{$data->{"searchtype"}})."\n" if (defined $data->{"searchtype"});