Changeset 32130 for main

Timestamp:

2018-02-13T11:18:58+13:00 (6 years ago)

Author:

kjdon

Message:

check whether an item in sites folder is actually a directory before trying to check it. checked_chdir outputs an error if it cant chdir into it. I had a zip file in my sites folder and it caused remote gli to stop working.

File:

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

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

@@ -914 +914 @@
     {
         my $site_dir_path= &util::filename_cat($sites_directory,$sites_dir);
-        $gsdl_cgi->checked_chdir($site_dir_path);
-        opendir(DIR,$site_dir_path);
-        @site_dir=readdir(DIR);
-        closedir(DIR);
-        
-        foreach $sub_dir_file(@site_dir)
-        {
-        if ($sub_dir_file eq "siteConfig.xml"){
-            print STDOUT "$sites_dir" . "-----";
+        if (-d $site_dir_path) {
+        $gsdl_cgi->checked_chdir($site_dir_path);
+        opendir(DIR,$site_dir_path);
+        @site_dir=readdir(DIR);
+        closedir(DIR);
+        
+        foreach $sub_dir_file(@site_dir)
+        {
+            if ($sub_dir_file eq "siteConfig.xml"){
+            print STDOUT "$sites_dir" . "-----";
+            last;
+            }
         }
         }