Changeset 31763 for main/trunk

Timestamp:

2017-06-29T18:18:06+12:00 (7 years ago)

Author:

ak19

Message:

Fixing somethings before attempting to refactor tmp_area_convert_file

File:

• main/trunk/greenstone2/perllib/plugins/UnknownConverterPlugin.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugins/UnknownConverterPlugin.pm

@@ -183 +183 @@
     my ($output_ext, $input_filename, $textref) = @_;
 
-    my $plugin_name = $self->{'plugin_type'}; # inherited from BaseImporter
-
     #### COPIED FROM ConvertBinaryFile::tmp_area_convert_file()
     my $outhandle = $self->{'outhandle'};
@@ -252 +250 @@
     # running under windows
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        $output_dirname = $tmp_dirname . "\\$utf8_tailname\\" . $utf8_tailname;
+        $output_dirname = $tmp_dirname . "\\$utf8_tailname\\";
     } else {
-        $output_dirname = $tmp_dirname . "\/$utf8_tailname\/" . $utf8_tailname;
+        $output_dirname = $tmp_dirname . "\/$utf8_tailname\/";
     }
-    $output_filename .= ".item";
+    $output_filename = $output_dirname . $utf8_tailname . ".item";
     } else {
     $output_filename =~ s/$lc_suffix$/.$output_type/;
@@ -270 +268 @@
     # If running the command returns 0, let's assume success and so the act of running the command
     # should produce either a text file or output to stdout.
+
+    my $plugin_name = $self->{'plugin_type'}; # inherited from BaseImporter
 
     my $cmd = $self->{'exec_cmd'};
@@ -315 +315 @@
 
 
-    if(defined $output_dirname && -d $output_dirname) {
+    if(defined $output_dirname && ! -d $output_dirname) {
     print $outhandle "$plugin_name Conversion error: Output directory $output_dirname doesn't exist\n";
     return "";
     }
-    elsif (!-e $output_filename) {
+    elsif (! -f $output_filename) {
     print $outhandle "$plugin_name Conversion error: Output file $output_filename doesn't exist\n";
     return "";