Changeset 15116 for gsdl/trunk/perllib/plugins/ConvertToPlug.pm

Timestamp:

2008-03-20T20:51:57+13:00 (16 years ago)

Author:

ak19

Message:

1. Doesn't presume that GSDLCOLLECT env var is set. 2. Sub tmp_area_convert_file tries GSDLCOLLECT folder, else goes to GSDLHOME folder to create tmp folder in

File:

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

gsdl/trunk/perllib/plugins/ConvertToPlug.pm

@@ -110 +110 @@
     my $plugin_package = $plugin_class.".pm";
 
-    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},
-                          "perllib/plugins", 
-                          $plugin_package);
+    my $colplugname = undef;
+    if (defined $ENV{'GSDLCOLLECTDIR'}) {
+        $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},
+                           "perllib","plugins", 
+                           $plugin_package);
+    }
+
     my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},
-                           "perllib/plugins", 
+                           "perllib","plugins", 
                            $plugin_package);
 
-    if (-e $colplugname) {require $colplugname;}
+    if ((defined $colplugname) && (-e $colplugname)) { require $colplugname;}
     elsif (-e $mainplugname) { require $mainplugname; }
     else {
@@ -256 +260 @@
     my $convert_to_ext = $self->{'convert_to_ext'};
     
-    # softlink to collection tmp dir
-    my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "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, "\\.[^\\.]+\$");
 
+    # softlink to collection tmp dir
+    my $tmp_dirname = $dirname;
+    if(defined $ENV{'GSDLCOLLECTDIR'}) {
+    $tmp_dirname = $ENV{'GSDLCOLLECTDIR'};
+    } elsif(defined $ENV{'GSDLHOME'}) {
+    $tmp_dirname = $ENV{'GSDLHOME'};
+    }
+    $tmp_dirname = &util::filename_cat($tmp_dirname, "tmp");
+    &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
+    
     # Remove any white space from filename -- no risk of name collision, and
     # makes later conversion by utils simpler. Leave spaces in path...
@@ -303 +312 @@
     }
     $cmd .= "-errlog \"$errlog\" -output $output_type \"$tmp_filename\"";
-
     $output_type = `$cmd`;
 
     # remove symbolic link to original file
     &util::rm($tmp_filename);
-
+    
     # Check STDERR here
     chomp $output_type;