Changeset 37679 for main

Timestamp:

2023-04-19T20:59:05+12:00 (12 months ago)

Author:

anupama

Message:

Dr Bainbridge's archives_keepold to archives *directory* rename requires a new gliserver.pl method renameCollectionFolder to call the appropriate FileUtils.pm function, as the existing moveCollectionFile only moves source files *into* destination if destination is a folder.

File:

• main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl (modified) (4 diffs)

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -195 +195 @@
     if ($cmd eq "move-collection-file") {
     &move_collection_file($gsdl_cgi, $username, $timestamp, $site);
+    return;
+    }
+    if ($cmd eq "rename-collection-folder") {
+    &rename_collection_folder($gsdl_cgi, $username, $timestamp, $site);
     return;
     }
@@ -1030 +1034 @@
 
 
-sub move_collection_file
+sub _move_rename_collection_file
 {
     my ($gsdl_cgi, $username, $timestamp, $site) = @_;
@@ -1079 +1083 @@
     &lock_collection($gsdl_cgi, $username, $collection, $site);
 
+    return ($source_file, $target_file);
+}
+    
+sub move_collection_file
+{
+    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
+
+    my ($source_file, $target_file) =  &_move_rename_collection_file($gsdl_cgi,
+                                     $username, $timestamp, $site);
+    
     &util::mv($source_file, $target_file);
 
@@ -1087 +1101 @@
 
     $gsdl_cgi->generate_ok_message("Collection file $source_file moved to $target_file successfully.");
+}
+
+sub rename_collection_folder
+{
+    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
+
+    my ($source_file, $target_file) =  &_move_rename_collection_file($gsdl_cgi,
+                                     $username, $timestamp, $site);
+
+    &FileUtils::renameDirectory($source_file, $target_file);
+
+    # Check that the collection source file was moved
+    if (-e $source_file || !-e $target_file) {
+    $gsdl_cgi->generate_error("Could not rename collection folder $source_file to $target_file."); # dies
+    }
+
+    $gsdl_cgi->generate_ok_message("Collection folder $source_file renamed to $target_file successfully.");
 }