Changeset 27325 for main/trunk

Timestamp:

2013-05-14T10:49:29+12:00 (11 years ago)

Author:

kjdon

Message:

changed old util function calls to the new FileUtils calls

File:

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

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

@@ -290 +290 @@
     
     if($gs_mode eq "gs2") {     
-        my $llssite_cfg = &util::filename_cat($ENV{'GSDLHOME'}, "llssite.cfg");
+        my $llssite_cfg = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "llssite.cfg");
         
         if(-f $llssite_cfg) {
@@ -514 +514 @@
     # work out the building and index dirs
     my $collection_dir = &util::resolve_collection_dir($collect_dir, $qualified_collection, $site);
-    $build_dir = &util::filename_cat($collection_dir, "building") unless (defined $build_dir);
-    $index_dir = &util::filename_cat($collection_dir, "index") unless (defined $index_dir);
+    $build_dir = &FileUtils::filenameConcatenate($collection_dir, "building") unless (defined $build_dir);
+    $index_dir = &FileUtils::filenameConcatenate($collection_dir, "index") unless (defined $index_dir);
     
     &print_task_msg("Running  Collection  Activation  Stage");
@@ -539 +539 @@
     
     if ($gs_mode eq "gs2") {
-        $build_cfg_filename = &util::filename_cat($build_dir,"build.cfg");
+        $build_cfg_filename = &FileUtils::filenameConcatenate($build_dir,"build.cfg");
     } else {
-        $build_cfg_filename = &util::filename_cat($build_dir, "buildConfig.xml");
+        $build_cfg_filename = &FileUtils::filenameConcatenate($build_dir, "buildConfig.xml");
         # gs_mode is GS3. Set the site now if this was not specified as cmdline argument
         #$site = "localsite" unless defined $site;
@@ -563 +563 @@
     # Except if we're (doing incremental) building for solr, where we want to still
     # activate and deactivate collections including for the incremental case
-    if(!&util::dir_exists($build_dir)) {
+    if(!&FileUtils::directoryExists($build_dir)) {
     &print_msg("No building folder at $build_dir to move to index.\n");
     exit -1 unless ($buildtype eq "solr"); #&& $incremental);
-    } elsif (&util::is_dir_empty($build_dir)) {
+    } elsif (&FileUtils::isDirectoryEmpty($build_dir)) {
     &print_msg("Nothing in building folder $build_dir to move into index folder.\n");
     exit -1 unless ($buildtype eq "solr"); #&& $incremental);
@@ -655 +655 @@
     if($removeold) {
         
-        if(&util::dir_exists($index_dir)) {
+        if(&FileUtils::directoryExists($index_dir)) {
             &print_task_msg("Removing \"index\"");
 
@@ -665 +665 @@
             }   
 
-            &util::rm_r($index_dir);
+            &FileUtils::removeFilesRecursive($index_dir);
             
             # Wait for a couple of seconds, just for luck
             sleep 2;
             
-            if (&util::dir_exists($index_dir)) {
+            if (&FileUtils::directoryExists($index_dir)) {
                 &print_msg("The index directory $index_dir could not be deleted.\n"); # CollectionManager.Index_Not_Deleted
             }
@@ -687 +687 @@
         # Move the building directory to become the new index directory
         &print_task_msg("Moving \"building\" -> \"index\"");
-        &util::mv($build_dir, $index_dir);
-        if(&util::dir_exists($build_dir) || !&util::dir_exists($index_dir)) {           
+        &FileUtils::moveFiles($build_dir, $index_dir);
+        if(&FileUtils::directoryExists($build_dir) || !&FileUtils::directoryExists($index_dir)) {           
             &print_msg("Could not move $build_dir to $index_dir.\n"); # CollectionManager.Build_Not_Moved
         }
@@ -703 +703 @@
         # existing files, but don't replace index with building.
         &print_task_msg("Moving \"building\" -> \"index\"");
-        &util::mv_dir_contents($build_dir, $index_dir);
+        &FileUtils::moveDirectoryContents($build_dir, $index_dir);
     }
 
@@ -732 +732 @@
     
     # Check for success: if building does not exist OR is empty 
-    if(!&util::dir_exists($build_dir) || &util::is_dir_empty($build_dir)) {
+    if(!&FileUtils::directoryExists($build_dir) || &FileUtils::isDirectoryEmpty($build_dir)) {
     
         if($library_url) { # undef if no valid server URL