Changeset 2029

Timestamp:

2001-02-20T16:12:55+13:00 (23 years ago)

Author:

jrm21

Message:

Return 0 instead of "" on error in read() so that RecPlug can continue.

File:

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

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -198 +198 @@
 
 
-
-# Override BasPlug read_file
-
-sub read_file {
-    my $self = shift (@_);
-    my ($src_filename, $encoding, $textref) = @_;
-
-    my $output_ext = $self->{'convert_to_ext'};
-    my $conv_filename = $self->tmp_area_convert_file($output_ext,$src_filename);
-    if ("$conv_filename" eq "") {return "";} # allows continue on errors
-    $self->{'conv_filename'} = $conv_filename;
-
-    BasPlug::read_file($self,$conv_filename, $encoding, $textref);
-}
 
 
@@ -234 +220 @@
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
 
-
     # read in file ($text will be in utf8)
     my $text = "";
-#    $self->read_file ($filename, $encoding, \$text);
-### was read_file
-#    my $self = shift (@_);
-#    my ($src_filename, $encoding, $textref) = @_;
 
     my $output_ext = $self->{'convert_to_ext'};
     my $conv_filename = $self->tmp_area_convert_file($output_ext,$filename);
-# change following to return undef?
-    if ("$conv_filename" eq "") {return "";} # allows continue on errors
+    if ("$conv_filename" eq "") {return 0;} # allows continue on errors
     $self->{'conv_filename'} = $conv_filename;
-
-### was read_file
-
-
-
 
 # Do encoding stuff