Changeset 2023 for trunk/gsdl

Timestamp:

2001-02-20T14:58:17+13:00 (23 years ago)

Author:

sjboddie

Message:

Changed pdftohtml.pl and gsConvert.pl to reflect the fact that their
respective binary files are now always installed to bin/$GSDLOS

Location:

trunk/gsdl/bin/script

Files:

• gsConvert.pl (modified) (1 diff)
• pdftohtml.pl (modified) (1 diff)

trunk/gsdl/bin/script/gsConvert.pl

@@ -327 +327 @@
     ($input_filename, $output_filestem) = @_;
 
-    my $wvWare = "";
-    my $wv_conf = "";
-
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-    $wvWare = "$ENV{'GSDLHOME'}\\bin\\windows\\wvWare.exe";
-    $wv_conf = "$ENV{'GSDLHOME'}\\bin\\windows\\wvHtml.xml";
-
-    } else {
-    # formulate the command
-    my $wv_home = &util::filename_cat($ENV{'GSDLHOME'}, "packages", "wv");
-    $wv_conf = &util::filename_cat($wv_home, "lib", "wv", "wvHtml.xml");
-    $wvWare = &util::filename_cat($wv_home, "bin", "wvWare");
-    }
+    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", 
+                     $ENV{'GSDLOS'}, "wvWare");
+    $wvWare .= ".exe" if ($ENV{'GSDLOS'} =~ /^windows$/i);
     return 0 unless (-e "$wvWare");
+
+    my $wv_conf = &util::filename_cat($ENV{'GSDLHOME'}, "packages", 
+                      "wv", "wvHtml.xml");
     
     $cmd = "";

trunk/gsdl/bin/script/pdftohtml.pl

@@ -103 +103 @@
 
     # formulate the command
-    my ($p_home, $pdftohtml);
-
-    if ($ENV{'GSDLOS'} =~ /^windows/i) {
-    $p_home = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "windows");
-    $pdftohtml = &util::filename_cat($p_home, "pdftohtml.bin");
-    }
-    else  {
-    $p_home = &util::filename_cat($ENV{'GSDLHOME'}, "packages", "pdftohtml");
-    $pdftohtml = &util::filename_cat($p_home, "bin", "pdftohtml.bin");
-    }
+    my $pdftohtml = &util::filename_cat($ENV{'GSDLHOME'}, "bin", 
+                    $ENV{'GSDLOS'}, "pdftohtml.bin");
     return 0 unless (-e "$pdftohtml");