Changeset 2515

Timestamp:

2001-06-11T12:15:21+12:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a couple of bugs/inconsistencies in word and pdf plugins that
affected their behaviour under the collector

Location:

trunk/gsdl/perllib/plugins

Files:

• ConvertToPlug.pm (modified) (4 diffs)
• PDFPlug.pm (modified) (2 diffs)
• WordPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -143 +143 @@
     my ($output_ext, $input_filename, $textref) = @_;
 
+    my $outhandle = $self->{'outhandle'};
     my $convert_to = $self->{'convert_to'};
 
     # softlink to collection tmp dir
-    my $colname = &util::use_collection();
     my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $colname, "tmp");
+    = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
     &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
 
@@ -165 +165 @@
     my $verbosity = $self->{'verbosity'};
     if ($verbosity > 0) {
-    print STDERR "Converting $tailname$suffix to $convert_to format\n";
+    print $outhandle "Converting $tailname$suffix to $convert_to format\n";
     }
     
@@ -180 +180 @@
     chomp $output_type;
     if ($output_type eq "fail") {
-    print STDERR "Could not convert $tailname$suffix to $convert_to format\n";
+    print $outhandle "Could not convert $tailname$suffix to $convert_to format\n";
     return "";
     }
@@ -199 +199 @@
     my $self = shift (@_);
 
-    my $colname = &util::use_collection();
     my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $colname, "tmp");
+    = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
     &util::rm_r($tmp_dirname);
     &util::mk_dir($tmp_dirname);

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -32 +32 @@
 }
 
-use strict;
-
-
 sub new {
     my $class = shift (@_);
@@ -65 +62 @@
     my $self = shift (@_);
 
-    print STDERR "PDFPlug: passing $_[3] onto $self->{'convert_to'} Plug\n" 
+    my $outhandle = $self->{'outhandle'};
+    print $outhandle "PDFPlug: passing $_[3] onto $self->{'convert_to'} Plug\n" 
     if $self->{'verbosity'} > 1;
     

trunk/gsdl/perllib/plugins/WordPlug.pm

@@ -32 +32 @@
 }
 
-use strict;
-
-
 sub get_default_process_exp {
     my $self = shift (@_);
@@ -46 +43 @@
 sub process {
     my $self = shift (@_);
-    
-    print STDERR "WordPlug: passing $_[3] onto $self->{'convert_to'} Plug\n" 
+
+    my $outhandle = $self->{'outhandle'};    
+    print $outhandle "WordPlug: passing $_[3] onto $self->{'convert_to'} Plug\n" 
     if $self->{'verbosity'} > 1;