Changeset 1417

Timestamp:

2000-08-17T11:02:51+12:00 (24 years ago)

Author:

davidb

Message:

Additions so ConvertPlug etc. can handle filenames with spaces in them.

Location:

trunk/gsdl

Files:

• bin/script/gs2html.pl (modified) (2 diffs)
• bin/script/gs2txt.pl (modified) (2 diffs)
• perllib/plugins/ConvertToBasPlug.pm (modified) (1 diff)

trunk/gsdl/bin/script/gs2html.pl

@@ -99 +99 @@
     {
     my $wv_cfgfile = &util::filename_cat($ENV{'GSDLHOME'},"etc","wvhtml.xml");
-    $cmd = "( echo Processing ; wvHtml --config $wv_cfgfile $input_filename 2>&1 > $output_filename )";
+    $cmd = "( echo Processing ; wvHtml --config $wv_cfgfile \"$input_filename\" 2>&1 > \"$output_filename\" )";
     $cmd .= " | fgrep -v wvWarning" if ($verbose<3);
     $cmd .= " | fgrep -v wvError" if ($verbose<5);
@@ -105 +105 @@
     elsif ($input_type eq "pdf")
     {
-    $cmd = "pdftohtml  -F -d $dirname -o $tailname.html $input_filename";
+    $cmd = "pdftohtml  -F -d $dirname -o \"$tailname.html\" \"$input_filename\"";
     $cmd .= " >/dev/null" if ($verbose<3);
     }

trunk/gsdl/bin/script/gs2txt.pl

@@ -99 +99 @@
     {
     my $wv_cfgfile = &util::filename_cat($ENV{'GSDLHOME'},"etc","wvtext.xml");
-    $cmd = "( echo Processing ; wvHtml --config $wv_cfgfile $input_filename 2>&1 > $output_filename )";
+    $cmd = "( echo Processing ; wvHtml --config $wv_cfgfile \"$input_filename\" 2>&1 > \"$output_filename\" )";
     $cmd .= " | fgrep -v wvWarning" if ($verbose<3);
     $cmd .= " | fgrep -v wvError" if ($verbose<5);
@@ -105 +105 @@
     elsif ($input_type eq "pdf")
     {
-    $cmd = "pdftotext $input_filename";
+    $cmd = "pdftotext \"$input_filename\"";
     }
     elsif ($input_type eq "ps")
     {
-    $cmd = "ps2ascii $input_filename > $output_filename";
+    $cmd = "ps2ascii \"$input_filename\" > \"$output_filename\"";
     }
     else

trunk/gsdl/perllib/plugins/ConvertToBasPlug.pm

@@ -90 +90 @@
     
     # run either gs2txt.pl or gs2html.pl to peform the requested conversion
-    if (system("gs2$output_ext.pl -verbose $verbosity $tmp_filename")>0)
+    if (system("gs2$output_ext.pl -verbose $verbosity \"$tmp_filename\"")>0)
     {
     print STDERR "Warning: unable to convert to $output_ext format\n";