Changeset 34152

Show
Ignore:
Timestamp:
12.06.2020 20:40:59 (4 weeks 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/servercontrol.pm

    r32830 r34152  
    283283    elsif ($gs_mode eq "gs3") { 
    284284    $self->print_msg("\t- Main library servlet\n");  
    285     my $DEACTIVATE_COMMAND = "?a=s&sa=d&st=collection&sn="; 
     285    my $DEACTIVATE_COMMAND = "?excerptid=gs_content&a=s&sa=d&st=collection&sn="; 
    286286    my $check_message_against_regex = "collection: $qualified_collection deactivated"; 
    287287    $self->config($DEACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex); 
     
    309309    elsif ($gs_mode eq "gs3") { 
    310310    $self->print_msg("\t- Main library servlet\n");  
    311     my $ACTIVATE_COMMAND = "?a=s&sa=a&st=collection&sn="; 
     311    my $ACTIVATE_COMMAND = "?excerptid=gs_content&a=s&sa=a&st=collection&sn="; 
    312312    my $check_message_against_regex = "collection: $qualified_collection activated"; 
    313313    $self->config($ACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex); 
     
    350350    } 
    351351    elsif ($gs_mode eq "gs3") {      
    352     $command = "?a=s&sa=ping"; 
     352    $command = "?a=s&sa=ping&excerptid=gs_content"; 
    353353    } 
    354354    return $self->ping($command); 
     
    369369    } 
    370370    elsif ($gs_mode eq "gs3") {      
    371     $command = "?a=s&sa=ping&st=collection&sn=$qualified_collection";        
     371    $command = "?a=s&sa=ping&st=collection&sn=$qualified_collection&excerptid=gs_content"; 
    372372    } 
    373373    return $self->ping($command, $silent);