Changeset 30596 for main

Timestamp:

2016-06-30T18:46:47+12:00 (8 years ago)

Author:

ak19

Message:

1. activate.pl modified to allow incremental-building with a manifest file. 2. servercontrol.pm modified to allow activating a collection when the gs3-server is set to use another servlet. The halftone-library servlet returns the ping succeeded message nested in a different element than the default library servlet. So the code's no longer getting the element first. Saves extra effort in the code anyway to do one regex instead of 3.

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (modified) (1 diff)
• perllib/servercontrol.pm (modified) (4 diffs)

main/trunk/greenstone2/bin/script/activate.pl

@@ -235 +235 @@
     # Except if we're (doing incremental) building for solr, where we want to still
     # activate and deactivate collections including for the incremental case
-    if(!&FileUtils::directoryExists($build_dir)) {
-    $gsserver->print_msg("No building folder at $build_dir to move to index.\n");
-    exit -1 unless ($buildtype eq "solr"); #&& $incremental);
-    } elsif (&FileUtils::isDirectoryEmpty($build_dir)) {
-    $gsserver->print_msg("Nothing in building folder $build_dir to move into index folder.\n");
-    exit -1 unless ($buildtype eq "solr"); #&& $incremental);
-    }
-    
+
+    if(!$incremental) { # if (!($incremental && ($build_dir eq $index_dir)))
+    
+    if(!&FileUtils::directoryExists($build_dir)) {
+        $gsserver->print_msg("No building folder at $build_dir to move to index.\n");
+        exit -1 unless ($buildtype eq "solr"); #&& $incremental);
+    } elsif (&FileUtils::isDirectoryEmpty($build_dir)) {
+        $gsserver->print_msg("Nothing in building folder $build_dir to move into index folder.\n");
+        exit -1 unless ($buildtype eq "solr"); #&& $incremental);
+    }
+    }
+
     # Now the logic in GLI's CollectionManager.java (processComplete() 
     # and installCollection()) and Gatherer.configGS3Server().

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -136 +136 @@
     # - with single quotes around it for linux for the cmd to run in bash subshell
     # - with a ^ before it on windows for the cmd to run in a DOS prompt subshell
-    # - or the entire wget command should be nested double quotes (single quotes don't work on windows)
+    # - or the entire wget command should be nested in double quotes (single quotes don't work on windows)
     my $wgetCommand = $command;
 
@@ -149 +149 @@
     $wgetCommand = "\"$wget_file_path\" --output-document=- -T 5 -t 1 \"$library_url$wgetCommand\" 2>&1";   
     #$wgetCommand = "\"$wget_file_path\" --spider -T 5 -t 1 \"$library_url$wgetCommand\" 2>&1"; # won't save page
+    ##print STDERR "@@@@ $wgetCommand\n";
+
     my $response_content = `$wgetCommand`;
     my $response_code = undef;
@@ -184 +186 @@
         # check the page content is as expected
         my $resultstr = $response_content;
-        $resultstr =~ s@.*gs_content\"\>@@s;        
-        $resultstr =~ s@</div>.*@@s;
+        #$resultstr =~ s@.*gs_content\"\>@@s;   ## only true for default library servlet    
+        #$resultstr =~ s@</div>.*@@s;
         if($resultstr =~ m/$check_message_against_regex/) {
         $self->print_msg(" Response as expected.\n", 3);
@@ -278 +280 @@
     my $expected_error_code = 500;
     
-    $self->print_msg("*** COMMAND WAS: |$command|***\n", 4);
+    $self->print_msg("*** COMMAND WAS: |$command| ***\n", 4);
     
     return $self->config($command, $check_responsemsg_against_regex, $expected_error_code, $silent);