Changeset 16362

Timestamp:

2008-07-11T15:16:16+12:00 (16 years ago)

Author:

ak19

Message:

Changes for when client FLI runs against a remote GS server and remote Fedora

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) (1 diff)

greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

@@ -989 +989 @@
     }
 
-    if (($script eq "import.pl") || ($script eq "buildcol.pl") || ($script eq "mkcol.pl")) { # || ($script eq "schedule.pl")
+    # mkcol.pl and import.pl, buildcol.pl, g2f-import.pl, g2f-buildcol.pl all need the -collectdir option passed
+    my $import_pl = "import.pl"; # import is a reserved word, need to put it in quotes
+    
+    if (($script =~ /$import_pl|buildcol.pl/) || ($script eq "mkcol.pl")) { # || ($script eq "schedule.pl")
     my $collect_directory = $gsdl_cgi->get_collection_dir($site); 
-    $perl_args = $perl_args . " -collectdir " . $collect_directory;
+    $perl_args = $perl_args . " -collectdir \"$collect_directory\"";
     }