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

Timestamp:

2020-07-11T09:46:29+12:00 (4 years ago)

Author:

ak19

Message:

Bugfix to the problem of a file that's being moved into its own location being clobbered on remote. In client-GLI, things would look okay, but when you try doing something with the file or reopen the collection, you notice that the file went missing from the collection. Now the remote code simply doesn't try moving a file if it's going into the same location it already is in.

File:

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

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

@@ -1037 +1037 @@
     }
 
+    # don't bother moving the file into the same location
+    # Plus attempting to do so ends up clobbering the file on the server side
+    if(&util::get_parent_folder($source_file) eq $target_file) {
+    $gsdl_cgi->generate_ok_message("Collection file $source_file is already inside $target_file. Not moving on itself.");
+    return;
+    }
+    
     # Ensure the user is allowed to edit this collection
     &authenticate_user($gsdl_cgi, $username, $collection, $site);