Changeset 2574 for trunk/gsdl/bin/script/gsConvert.pl

Timestamp:

2001-06-19T14:26:54+12:00 (23 years ago)

Author:

jrm21

Message:

gsConvert now knows about rtftohtml package. wv config file is now in
etc/packages/, not etc/wv/.

File:

• trunk/gsdl/bin/script/gsConvert.pl (modified) (5 diffs)

trunk/gsdl/bin/script/gsConvert.pl

@@ -56 +56 @@
     print STDERR "              or text using third-party programs.\n\n";
     print STDERR "  usage: $0 [options] filename\n";
-    print STDERR "  options:\n\t-type\tdoc|pdf|ps\n\t-output\thtml|text\n";
+    print STDERR "  options:\n\t-type\tdoc|pdf|ps|rtf\n\t-output\thtml|text\n";
     print STDERR "\t-timeout\t<max cpu seconds>\n";
     exit(1);
@@ -70 +70 @@
     # read command-line arguments
     if (!parsargv::parse(\@ARGV,
-             'type/(doc|pdf|ps)/', \$input_type,
+             'type/(doc|pdf|ps|rtf)/', \$input_type,
              'output/(html|text)/', \$output_type,
              'timeout/\d+/0',\$timeout,
@@ -339 +339 @@
 
     my $wv_conf = &util::filename_cat($ENV{'GSDLHOME'}, "etc", 
-                      "wv", "wvHtml.xml");
+                      "packages", "wv", "wvHtml.xml");
     
     my $cmd = "";
@@ -377 +377 @@
 
 # Attempt to convert an RTF document to html with rtftohtml
-#
-# rtf2html isn't distributed with Greenstone because it is not 
-# distributed under the GPL.  If you know of a better solution,
-# please let me know.
 
 sub rtf_to_html {
     my ($input_filename, $output_filestem) = @_;
 
-    # we'll give up already if using Windows
-    return 0 if $ENV{'GSDLOS'} =~ /^windows$/i;
-
     # formulate the command
-    my $r_cmd = &util::filename_cat($ENV{'GSDLHOME'}, "packages", "unix", 
-                    "rtf2html", "rtf2html", "rtf2html");
-    $r_cmd = "rtf2html" unless (-e "$r_cmd");
-    return 0 unless (-e "$r_cmd");
     $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    $cmd .= "$r_cmd";
-    $cmd .= " \"$input_filename\" > \"$output_filestem.html\" 2>\"$output_filestem.err\"";
+    $cmd .= "rtftohtml";
+
+    # it automatically uses $output_filestem.html
+    $cmd .= " \"$input_filename\"";
+
+    $cmd .= " 2>\"$output_filestem.err\""
+        unless $ENV{'GSDLOS'} =~ /^windows$/i;
+
 
     # execute the command
@@ -404 +399 @@
     }
 
+    # this will probably give a warning under windows...
+    &util::rm("$output_filestem.err");
+
     # Was the conversion successful?
     if (-e "$output_filestem.html") {
-    open(TMP, "$output_filestem.html");
-    $line = <TMP>;
-    close(TMP);
-    if ($line && $line =~ /DOCTYPE HTML/) {
-        &util::rm("$output_filestem.err");
-        return 1;
-    } else {
-        # An error of some sort occurred
-        &util::rm("$output_filestem.html");
-        &util::rm("$output_filestem.err");
-    }
-    }
+    return 1;
+    }
+
     return 0;
 }