Changeset 2241 for trunk/gsdl/perllib

Timestamp:

2001-04-01T21:19:25+12:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up the ConvertToPlug stuff to get it working on Windows 95/98

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (11 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -94 +94 @@
     if ($class eq "ConvertToPlug") {$class = shift (@_);}
     my $self;
-# parsargv::parse might modify the list, so we do this by creating a copy
-# of the argument list.
+    # parsargv::parse might modify the list, so we do this by creating a copy
+    # of the argument list.
     my @arglist = @_;
-    my ($plugin_name,$generate_format, $kea_arg) = $class->parse_args(\@_);
+    my ($plugin_name, $generate_format, $kea_arg) = $class->parse_args(\@_);
+
+    if ($class eq "PDFPlug" && $generate_format eq "text" && 
+    $ENV{'GSDLOS'} =~ /^windows$/i) {
+    print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
+    $generate_format = "html";
+    }
 
     if ($generate_format eq "text")
@@ -135 +141 @@
 sub tmp_area_convert_file {
     my $self = shift (@_);
-    my ($output_ext,$input_filename, $textref) = @_;
+    my ($output_ext, $input_filename, $textref) = @_;
 
     my $convert_to = $self->{'convert_to'};
@@ -142 +148 @@
     my $colname = &util::use_collection();
     my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLHOME'},"collect",$colname,"tmp");
+    = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $colname, "tmp");
     &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
 
     # derive tmp filename from input filename
-    my ($tailname,$dirname,$suffix)
-    = File::Basename::fileparse($input_filename,'\.[^\.]+$');
+    my ($tailname, $dirname, $suffix)
+    = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
 
     # Remove any white space from filename -- no risk of name collision, and
@@ -153 +159 @@
     $tailname =~ s/\s+//g; 
 
-    my $tmp_filename = &util::filename_cat($tmp_dirname,"$tailname$suffix");
-
-    &util::soft_link($input_filename,$tmp_filename);
+    my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
+
+    &util::soft_link($input_filename, $tmp_filename);
 
     my $verbosity = $self->{'verbosity'};
-    if ($verbosity>0)
-    {
+    if ($verbosity > 0) {
     print STDERR "Converting $tailname$suffix to $convert_to format\n";
     }
@@ -166 +171 @@
     # making sure the converter gives us the appropriate output type
     my $output_type = lc($convert_to);
-    my $cmd = "gsConvert.pl -verbose $verbosity -output $output_type \"$tmp_filename\"";
+    my $cmd = "perl -S gsConvert.pl -verbose $verbosity -output $output_type \"$tmp_filename\"";
     $output_type = `$cmd`;
-
-    # Check STDERR here
 
     chomp $output_type;
@@ -175 +178 @@
     print STDERR "Could not convert $tailname$suffix to $convert_to format\n";
     return "";
-### exit 1;
     }
 
@@ -184 +186 @@
     $self->{'convert_to_ext'} = $output_type;
     my $output_filename = $tmp_filename;
+
     $output_filename =~ s/$suffix$/.$output_type/;
 
@@ -197 +200 @@
     my $colname = &util::use_collection();
     my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLHOME'},"collect",$colname,"tmp");
+    = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $colname, "tmp");
     &util::rm_r($tmp_dirname);
     &util::mk_dir($tmp_dirname);
@@ -229 +232 @@
 
     my $output_ext = $self->{'convert_to_ext'};
-    my $conv_filename = $self->tmp_area_convert_file($output_ext,$filename);
+    my $conv_filename = $self->tmp_area_convert_file($output_ext, $filename);
+
     if ("$conv_filename" eq "") {return 0;} # allows continue on errors
     if (! -e "$conv_filename") {return 0;} # allows continue on errors
     $self->{'conv_filename'} = $conv_filename;
 
-# Do encoding stuff
+    # Do encoding stuff
     my ($language, $encoding);
     if ($self->{'input_encoding'} eq "auto") {
@@ -253 +257 @@
     }
 
-    BasPlug::read_file($self,$conv_filename, $encoding, \$text);
+    &BasPlug::read_file($self, $conv_filename, $encoding, \$text);
     if (!length ($text)) {
         print $outhandle "$plugin_name: ERROR: $file contains no text\n" if $self->{'verbosity'};
@@ -301 +305 @@
     {
 
-    $ret_val = TEXTPlug::process($self,$textref,$pluginfo,
-                     $tmp_dirname,$tmp_tailname,
-                     $metadata,$doc_obj);
+    $ret_val = &TEXTPlug::process($self, $textref, $pluginfo,
+                      $tmp_dirname, $tmp_tailname,
+                      $metadata, $doc_obj);
     }
     else
     {
-    $ret_val = HTMLPlug::process($self,$textref,$pluginfo,
-                     $tmp_dirname,$tmp_tailname,
-                     $metadata,$doc_obj);
+    $ret_val = &HTMLPlug::process($self, $textref, $pluginfo,
+                      $tmp_dirname, $tmp_tailname,
+                      $metadata, $doc_obj);
     }
 
     # associate original file with doc object
     my $cursection = $doc_obj->get_top_section();
-    my $filename = &util::filename_cat($base_dir,$file);
+    my $filename = &util::filename_cat($base_dir, $file);
     $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);