Changeset 36839 for main

Timestamp:

2022-10-19T12:29:09+13:00 (19 months ago)

Author:

kjdon

Message:

added serviceRack attribute to <search name='xxx' orthogonal='true'> - if specified, then you can write the serviceRack directly into collectionConfig serviceRackList, instead of it auto generating one (named GS2+<search_name>+Search) into buildConfig

Location:

main/trunk/greenstone2/perllib

Files:

• buildConfigxml.pm (modified) (2 diffs)
• collConfigxml.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -215 +215 @@
 
     if (defined $collectcfg->{"orthogonalbuildtypes"}) {
-    # Note the use of collectcfg, not bulidcfg
+    # Note the use of collectcfg, not buildcfg
     $settings->{'orthogonalbuildtypes'} = $collectcfg->{"orthogonalbuildtypes"};
     } else {
     $settings->{'orthogonalbuildtypes '}= [];
+    }
+    if (defined $collectcfg->{"orthogonalcustomservicerack"}) {
+    # Note the use of collectcfg, not buildcfg
+    $settings->{'orthogonalcustomservicerack'} = $collectcfg->{"orthogonalcustomservicerack"};
+    } else {
+    $settings->{'orthogonalcustomservicerack'}= {};
     }
 
@@ -616 +622 @@
     my $orthogonalbuildtypes = $settings->{'orthogonalbuildtypes'};
 
+    #if a custom service rack has been specified, then we don't output anything here
+    my $orthogonalcustomservicerack = $settings->{'orthogonalcustomservicerack'};
+
     foreach my $obt (@$orthogonalbuildtypes) {
-    $obt =~ s/^(.)/\u$1/; # capitialize initial letter
-    $obt =~ s/-(.)/\u$1/g; # change any hyphenated words to cap next letter
-
-    &write_line('COLCFG', ["<serviceRack name=\"GS2", $obt, "Search\">"]);
-
-    &write_line('COLCFG',["<databaseType name=\"",$infodbtype,"\" />"]);  
-    &write_line('COLCFG', ["</serviceRack>"]);
+        if (!defined $orthogonalcustomservicerack->{$obt}) {
+            $obt =~ s/^(.)/\u$1/; # capitialize initial letter
+            $obt =~ s/-(.)/\u$1/g; # change any hyphenated words to cap next letter
+            
+            &write_line('COLCFG', ["<serviceRack name=\"GS2", $obt, "Search\">"]);
+            
+            &write_line('COLCFG',["<databaseType name=\"",$infodbtype,"\" />"]);  
+            &write_line('COLCFG', ["</serviceRack>"]);
+            print STDERR "Outputting orthogonal service rack to buildConfig, derived name = GS2".$obt. "Search\n";
+        } else {
+            print STDERR "Orthogonal search specified a serviceRack: ".$orthogonalcustomservicerack->{$obt}.", make sure you have specified that in your collectionConfig.xml serviceRackList\n";
+        }
+        
     }
 }

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -113 +113 @@
         return undef;
     }
-
     # Removed ProtocolEncoding (see MetadataXMLPlugin for details)
 
@@ -192 +191 @@
     if ((defined $orthogonal) && ($orthogonal =~ m/^(true|on|1)$/i)) {
         push(@{$data->{'orthogonalbuildtypes'}},$type);
+            my $service_rack = $_{'serviceRack'};
+            if ((defined $service_rack) && $service_rack =~ /\w/) {
+                $data->{'orthogonalcustomservicerack'}->{$type} = $service_rack;;
+            }
     }
     else {
@@ -431 +434 @@
     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 "*** orthogonal build types: ".join(",",@{$data->{"orthogonalbuildtypes"}})."\n" if (defined $data->{"orthogonalbuildtypes"});
+    if (defined $data->{"orthogonalcustomservicerack"}) {     
+        print STDERR "*** orthogonal custom service racks: \n";
+        foreach my $s (keys %{$data->{"orthogonalcustomservicerack"}}) {
+            print STDERR "$s -> ". $data->{"orthogonalcustomservicerack"}->{$s}."\n";
+        }
+    }
     print STDERR "*** search types: \n";
     print STDERR join(",",@{$data->{"searchtype"}})."\n" if (defined $data->{"searchtype"});