Changeset 22453

Timestamp:

2010-07-20T16:44:14+12:00 (14 years ago)

Author:

ak19

Message:

2nd commit to do with getting Remote GLI to work with colgroups: changes to gliserver.pl, mostly to do with replacing the vertical bar separating the colgroup and coltailname with the OS-dependent slash.

File:

• main/trunk/greenstone2/cgi-bin/gliserver.pl (modified) (11 diffs)

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

@@ -406 +406 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
 
     # Ensure the user is allowed to edit this collection
@@ -442 +443 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {
@@ -492 +495 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
     
     # language and region Environment Variable setting on the client side that was used to zip files.
@@ -548 +552 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
 
     # language and region Environment Variable setting on the client side that was used to zip files.
@@ -639 +644 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {
@@ -669 +676 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    my $collection_tail_name = s/^(.*\|)//;
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     # language and region Environment Variable setting on the client side that was used to zip files.
     my $lang_env = $gsdl_cgi->clean_param("lr") || "";
@@ -701 +711 @@
     my $java = $gsdl_cgi->get_java_path();
     my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar");
-    my $zip_file_path = &util::filename_cat($collection_directory, $collection . "-file-" . $timestamp . ".zip");
+    my $zip_file_path = &util::filename_cat($collection_directory, $collection_tail_name . "-file-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\"";
     $ENV{'LANG'} = $lang_env;
@@ -886 +896 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     my $source_file = $gsdl_cgi->clean_param("source");
     if ((!defined $source_file) || ($source_file =~ m/^\s*$/)) {
@@ -937 +949 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     my $directory = $gsdl_cgi->clean_param("directory");
     if ((!defined $directory) || ($directory =~ m/^\s*$/)) {
@@ -992 +1006 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
     $gsdl_cgi->delete("c");
 
@@ -1075 +1090 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    $collection =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {