Changeset 24597 for main/trunk/greenstone2/perllib

Timestamp:

2011-09-14T10:38:59+12:00 (13 years ago)

Author:

davidb

Message:

Modifications to help image-server.pl run under Greenstone3 on Windows

File:

• main/trunk/greenstone2/perllib/cgiactions/imageaction.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/cgiactions/imageaction.pm

@@ -98 +98 @@
     }
 
-    my $collect_directory = &util::filename_cat($gsdlhome, "collect");
+    my $site = $self->{'site'};
+    my $collect_directory = $gsdl_cgi->get_collection_dir($site);
+    #my $collect_directory = &util::filename_cat($gsdlhome, "collect");
 #    $gsdl_cgi->checked_chdir($collect_directory);
 
@@ -172 +174 @@
     # now output it with suitable mime header
     print STDOUT "Content-type:$mime_type\n\n";
-    system("cat \"$dst_full_assoc_filename\"");
+
+    if (open(IMGIN,"<$dst_full_assoc_filename")) {
+        binmode IMGIN;
+        binmode STDOUT;
+        
+        my $data;        
+        while (read(IMGIN,$data,1024) != 0) { 
+        print STDOUT $data;
+        } 
+
+        close(IMGIN);
+
+        #system("cat \"$dst_full_assoc_filename\"");
+    }
+    else {
+        $gsdl_cgi->generate_error("Unable to open $dst_full_assoc_filename for output");
+    }
     }
     else {