Changeset 30524 for main/trunk/greenstone2/bin/script/activate.pl

Timestamp:

2016-05-10T16:39:20+12:00 (8 years ago)

Author:

ak19

Message:

1. get_library_URL() called internal to servercontrol.pm when using servercontrol in activate.pl too. 2. More tidying up: removed lots of variables no longer in use.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (3 diffs)

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

@@ -113 +113 @@
     
     print STDERR "\n";
-    print STDERR "Usage: $progname [-collectdir c -builddir b -indexdir i -site s -skipactivation -removeold -keepold -verbosity v\n";
+    print STDERR "Usage: $progname [-collectdir c -builddir b -indexdir i -site s -skipactivation -removeold -keepold -incremental -verbosity v\n";
     print STDERR "\t-library_url URL -library_name n] <[colgroup/]collection>\n";
     print STDERR "\n";
@@ -247 +247 @@
     
     # 1. Get library URL
-    
-    # For web servers that are external to a Greenstone installation, 
-    # the user can pass in their web server's library URL.
-    # For web servers included with GS (like tomcat for GS3 and server.exe 
-    # and apache for GS2), we work out the library URL:
-    if(!$library_url) { 
-    $library_url = $gsserver->get_library_URL(); # returns undef if no server is running
-    }
-    
-    # CollectionManager's installCollection phase in GLI
-    # 2. Ping the library URL, and if it's a persistent server and running, release the collection    
-    if($library_url && !$skipactivation) { # undef if no valid server URL   
-    $gsserver->do_deactivate(); 
-    }
+    # CollectionManager's installCollection phase in GLI:
+    # 2. Ping the library URL, and if it's a persistent server and running, release the collection   
+    $gsserver->do_deactivate() unless $skipactivation;    
 
     # 2b. If we're working with a solr collection, then start up the solrserver now.
@@ -386 +375 @@
 
     
-    # 4. Ping the library URL, and if it's a persistent server and running, activate the collection again   
+    # 4. Ping the library URL, and if it's a persistent server and running, activate the collection again
     
     # Check for success: if building does not exist OR is empty OR if building is index (in which case there was no move)   
     if($build_dir eq $index_dir || !&FileUtils::directoryExists($build_dir) || &FileUtils::isDirectoryEmpty($build_dir)) {
     
-    if($library_url && !$skipactivation) { # undef if no valid server URL
-        $gsserver->do_activate();
-    }
+    $gsserver->do_activate() unless $skipactivation;
+    
     } else { # installcollection failed     
     #CollectionManager.Preview_Ready_Failed