Changeset 25596 for main

Timestamp:

2012-05-14T15:54:36+12:00 (12 years ago)

Author:

ak19

Message:

1. Setting executable permissions on activate.pl for unix-based machines. 2. Only check whether the collection on the server is active after the is-persistent check, because it's not necessary to check whether a collection is active on a server that's not persistent, as there's no point in attempting to deactivate or activate cols on servers that aren't persistent.

File:

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

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

@@ -539 +539 @@
             # the server is persistent and the collection is active
             &print_msg("Checking if Greenstone server is persistent\n");
-            $is_persistent_server = &is_persistent($library_url, $gs_mode);
-            
-            &print_msg("Checking if the collection $qualified_collection is already active\n");
-            my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
-            
-            if($is_persistent_server && $collection_active) {
+            $is_persistent_server = &is_persistent($library_url, $gs_mode);         
+            
+            if($is_persistent_server) { # only makes sense to issue activate and deactivate cmds to a persistent server
+                
+                &print_msg("Checking if the collection $qualified_collection is already active\n");
+                my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
+
+                if($collection_active) {
                 &print_msg("De-activating collection $qualified_collection\n");
                 &deactivate_collection($library_url, $gs_mode, $qualified_collection, $site);
+                }
             }   
         }
@@ -608 +611 @@
                 }
                 
-                &print_msg("Checking if the collection $qualified_collection is not already active\n");             
-                my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);                 
                     
-                if($is_persistent_server && !$collection_active) {                  
+                if($is_persistent_server) { # persistent server, so can try activating collection
+
+                    &print_msg("Checking if the collection $qualified_collection is not already active\n");
+                    my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
+
+                    if(!$collection_active) {
                     &print_msg("Activating collection $qualified_collection\n");
                     &activate_collection($library_url, $gs_mode, $qualified_collection, $site);
+                    }
                 }
             }