Changeset 34152

Timestamp:

2020-06-12T20:40:59+12:00 (4 years ago)

Author:

ak19

Message:

When sending a request to activate and deactivate, can request excerptid=gs_content, to cut down to just the portion of the response that contains the message we're waiting for

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -283 +283 @@
     elsif ($gs_mode eq "gs3") {
     $self->print_msg("\t- Main library servlet\n"); 
-    my $DEACTIVATE_COMMAND = "?a=s&sa=d&st=collection&sn=";
+    my $DEACTIVATE_COMMAND = "?excerptid=gs_content&a=s&sa=d&st=collection&sn=";
     my $check_message_against_regex = "collection: $qualified_collection deactivated";
     $self->config($DEACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex);
@@ -309 +309 @@
     elsif ($gs_mode eq "gs3") {
     $self->print_msg("\t- Main library servlet\n"); 
-    my $ACTIVATE_COMMAND = "?a=s&sa=a&st=collection&sn=";
+    my $ACTIVATE_COMMAND = "?excerptid=gs_content&a=s&sa=a&st=collection&sn=";
     my $check_message_against_regex = "collection: $qualified_collection activated";
     $self->config($ACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex);
@@ -350 +350 @@
     }
     elsif ($gs_mode eq "gs3") {     
-    $command = "?a=s&sa=ping";
+    $command = "?a=s&sa=ping&excerptid=gs_content";
     }
     return $self->ping($command);
@@ -369 +369 @@
     }
     elsif ($gs_mode eq "gs3") {     
-    $command = "?a=s&sa=ping&st=collection&sn=$qualified_collection";       
+    $command = "?a=s&sa=ping&st=collection&sn=$qualified_collection&excerptid=gs_content";
     }
     return $self->ping($command, $silent);