Changeset 21783 for main/trunk

Timestamp:

2010-03-15T11:53:59+13:00 (14 years ago)

Author:

kjdon

Message:

don't write out OAI servicerack here. do it in collectionConfig as it doesn't depend on building. so don't need to rebuild to turn it off

File:

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

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -256 +256 @@
     &write_line('COLCFG', ["<metadata name=\"numDocs\">", $numdocs, "</metadata>"]);
     &write_line('COLCFG', ["<metadata name=\"buildType\">", $buildtype, "</metadata>"]);
+    if (defined $buildcfg->{'indexstem'}) {
+    &write_line('COLCFG', ["<metadata name=\"indexStem\">", $buildcfg->{"indexstem"}, "</metadata>"]);
+    }
+    if (defined $buildcfg->{'infodbtype'}) {
+    &write_line('COLCFG', ["<metadata name=\"infodbType\">", $buildcfg->{"infodbtype"}, "</metadata>"]);
+    }
     &write_line('COLCFG', ["</metadataList>"]);
 
@@ -268 +274 @@
     &write_line('COLCFG', ["<serviceRackList>"]);
 
-    # This serviceRack enables the collection to provide the oai metadata retrieve service, which is served by the OAIPMH.java class
-    # For each collection, we write the following serviceRack in the collection's buildConfig.xml file if the 'disable_OAI' argument is not checked in the GLI (or equivalently, a 'disable_OAI' flag is not specified on the command line). There are also other configurations in the OAIConfig.xml.
-    if ($disable_OAI == 0) {
-      &write_line('COLCFG', ["<serviceRack name=\"OAIPMH\">"]);
-      if (defined $buildcfg->{'indexstem'}) {
-        my $indexstem = $buildcfg->{'indexstem'};
-        &write_line('COLCFG', ["<indexStem name=\"", $indexstem, "\" />"]);     
-      }
-      if (defined $buildcfg->{'infodbtype'}) {
-      my $infodbtype = $buildcfg->{'infodbtype'};
-      &write_line('COLCFG', ["<databaseType name=\"", $infodbtype, "\" />"]);     
-      }
-      &write_line('COLCFG', ["</serviceRack>"]);
-    }    
     # do the search service 
     &write_line('COLCFG', ["<serviceRack name=\"GS2", $service_type, "Search\">"]);
@@ -394 +386 @@
     }
     #for each level in levelList, write them out
-    if ($buildtype ne "mg") {
+    if ($buildtype ne "mg") {
     &write_line('COLCFG', ["<levelList>"]);
     foreach my $lv (@levellist) {