Changeset 32830 for main/trunk/greenstone2

Timestamp:

2019-02-28T22:00:57+13:00 (5 years ago)

Author:

ak19

Message:

Second and final part of fixing up OAI stuff so that there's no lock on the index db by OAI servlet side when a collection is being rebuilt. The bug was that the OAI servlet side would still keep a filelock on the db (index col db and etc oai-inf db, to be precise) when a collection was deactivated before moving build to index during the activate.pl stage. That's because the OAIMessageRouter does not responde to (de)activate messages sent to the regular library servlet's MessageRouter. This commit: Getting servercontrol.pm of activate.pl to send a request to (de)activate a collection to the OAIMessageRouter was far more involved: although OAIMessageRouter inherits from MessageRouter, it did not recognise the (de)activate query params because it specifically only recognises OAI verbs like Identify and the special case of 'reset' sent to the OAIMessageRouter. So added in pathways for activate and deactivate to be recognised and processed. Now servercontrol.pm will send (de)activate requests to both the MessageRouter and the OAIMessageRouter. And there's further support for if a collection is not an OAICollection (not part of the list of collections maintained by OAIReceptionist). What I don't have working, is that the collection is still enumerated by ListSets of the OAI servlet whereas attempting to view records and identifiers of the deactivated set fails. This misbehaviour doesn't impact rebuilding with activate.pl since it both deactivates then activates a collection, so a collection is not meant to remain in the deactivated state. The fix may be more complicated than removing the collection from OAIReceptionist's list of sets, since the OAI side deals with supercollections etc when it first loads OAICollections. So any fix has to take that into account.

File:

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

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -117 +117 @@
 sub config {
     my $self = shift(@_);
-    my ($command, $check_message_against_regex, $expected_error_code, $silent) = @_;
+    my ($command, $check_message_against_regex, $expected_error_code, $silent, $oai_servlet) = @_;
 
     my $library_url = $self->get_library_URL(); #$self->{'library_url'};
-
+    if($oai_servlet) { # if asked to contact the oaiserver servlet, then
+        # replace the library servlet name with oaiserver servlet name
+        $library_url =~ s@([^/]*?)$@$oai_servlet@;
+    }
 
     # Gatherer.java's configGS3Server doesn't use the site variable
@@ -279 +282 @@
     }
     elsif ($gs_mode eq "gs3") {
+    $self->print_msg("\t- Main library servlet\n"); 
     my $DEACTIVATE_COMMAND = "?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);
+    
+    # and deactivate the collection on OAIserver url too.
+    # NOTE: if it's not an OAI collection, then the message that the collection is "not enabled for OAI" is EXPECTED. Another possible valid outcome.
+    $self->print_msg("\t- OAI servlet\n");  
+    $DEACTIVATE_COMMAND = "?deactivate=";
+    $check_message_against_regex = "(collection\: $qualified_collection deactivated|collection\: $qualified_collection is not enabled for OAI.)";
+    $self->config($DEACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, "oaiserver");
     }   
 }
@@ -297 +308 @@
     }
     elsif ($gs_mode eq "gs3") {
+    $self->print_msg("\t- Main library servlet\n"); 
     my $ACTIVATE_COMMAND = "?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);
+    
+    # and activate the collection on OAIserver url too.
+    # NOTE: if it's not an OAI collection, then the message that the collection is "not enabled for OAI" is EXPECTED. Another possible valid outcome.
+    $self->print_msg("\t- OAI servlet\n");  
+    $ACTIVATE_COMMAND = "?activate=";
+    $check_message_against_regex = "(collection\: $qualified_collection activated|collection\: $qualified_collection is not enabled for OAI.)";
+    $self->config($ACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, "oaiserver");
     }   
 }
@@ -544 +563 @@
 sub config_old {
     my $self = shift(@_);
-    my ($command, $check_message_against_regex, $expected_error_code, $silent) = @_;
+    my ($command, $check_message_against_regex, $expected_error_code, $silent, $oai_servlet) = @_;
 
     my $library_url = $self->get_library_URL(); #$self->{'library_url'};
-
+    if($oai_servlet) { # if asked to contact the oaiserver servlet, then
+        # replace the library servlet name with oaiserver servlet name
+        $library_url =~ s@([^/]*?)$@$oai_servlet@;
+    }
 
     # Gatherer.java's configGS3Server doesn't use the site variable