Changeset 13811

Timestamp:

2007-01-25T17:24:31+13:00 (17 years ago)

Author:

mdewsnip

Message:

Now uses the new timestamp argument instead of the username in zip file names, to avoid having the username in the name twice for personal collections.

File:

• trunk/gsdl/cgi-bin/gliserver.pl (modified) (6 diffs)

trunk/gsdl/cgi-bin/gliserver.pl

@@ -59 +59 @@
     # Get then remove the ts (timestamp) argument (since this can mess up other scripts)
     my $timestamp = $gsdl_cgi->clean_param("ts");
+    if ((!defined $timestamp) || ($timestamp =~ m/^\s*$/)) {
+    $timestamp = time();  # Fall back to using the Perl time() function to generate a timestamp
+    }
     $gsdl_cgi->delete("ts");
 
@@ -375 +378 @@
     my $java = $gsdl_cgi->get_java_path();
     my $java_classpath = &util::filename_cat($gsdlhome, "bin", "java", "GLIServer.jar");
-    my $zip_file_path = &util::filename_cat($collect_directory, $username . "-" . $collection . ".zip");
+    my $zip_file_path = &util::filename_cat($collect_directory, $collection . "-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\"";
     my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 
@@ -422 +425 @@
     my $java = $gsdl_cgi->get_java_path();
     my $java_classpath = &util::filename_cat($gsdlhome, "bin", "java", "GLIServer.jar");
-    my $zip_file_path = &util::filename_cat($collect_directory, $username . "-" . $collection . "-archives.zip");
+    my $zip_file_path = &util::filename_cat($collect_directory, $collection . "-archives-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\"";
     my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 
@@ -457 +460 @@
     my $java = $gsdl_cgi->get_java_path();
     my $java_classpath = &util::filename_cat($gsdlhome, "bin", "java", "GLIServer.jar");
-    my $zip_file_path = &util::filename_cat($collect_directory, $username . "-" . "collection-configurations.zip");
+    my $zip_file_path = &util::filename_cat($collect_directory, "collection-configurations-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\"";
     my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 
@@ -514 +517 @@
     my $java = $gsdl_cgi->get_java_path();
     my $java_classpath = &util::filename_cat($gsdlhome, "bin", "java", "GLIServer.jar");
-    my $zip_file_path = &util::filename_cat($collection_directory, $username . "-" . $collection . "-file.zip");
+    my $zip_file_path = &util::filename_cat($collection_directory, $collection . "-file-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\"";
     my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
@@ -786 +789 @@
     }
 
-    my $file_path = &util::filename_cat($directory_path, $username . "-" . $file);
+    my $file_path = &util::filename_cat($directory_path, $file . "-" . $timestamp);
     if (!open(FOUT, ">$file_path")) {
     $gsdl_cgi->generate_error("Unable to write file $file_path");