Changeset 20320

Timestamp:

2009-08-18T16:42:28+12:00 (15 years ago)

Author:

kjdon

Message:

some changes to get MARCXML exporting working on windows

File:

• gsdl/trunk/perllib/plugouts/BasePlugout.pm (modified) (7 diffs)

gsdl/trunk/perllib/plugouts/BasePlugout.pm

@@ -58 +58 @@
     'type' => "string",
     'reqd' => "no",
+     'deft' => "",
     'hiddengli' => "no"},
        { 'name' => "output_handle", 
@@ -96 +97 @@
     push(@$plugoutlist, $class);
 
-    my $strPlugoutName = (defined $plugoutlist->[0]) ? $plugoutlist->[0] : $class;
+    my $plugout_name = (defined $plugoutlist->[0]) ? $plugoutlist->[0] : $class;
 
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
@@ -122 +123 @@
     {
     my $classTempClass = bless $self, $class;
-    print STDERR "<BadPlugout d=$self->{'plugout_name'}>\n";
-    &gsprintf(STDERR, "\n{BasPlugout.bad_general_option}\n", $self->{'plugout_name'});
+    print STDERR "<BadPlugout d=$plugout_name>\n";
+    &gsprintf(STDERR, "\n{BasPlugout.bad_general_option}\n", $plugout_name);
     $classTempClass->print_txt_usage("");  # Use default resource bundle
     die "\n";
@@ -131 +132 @@
     if(defined $self->{'xslt_file'} &&  $self->{'xslt_file'} ne "")
     {
-      ##$self->{'xslt_file'} =~ s/\"//g;##working on Windows???
-    print STDERR "Can not find $self->{'xslt_file'}, please make sure you have supplied the correct file path\n" and  die "\n" unless (-e $self->{'xslt_file'});
+    my $full_file_path = &util::locate_config_file($self->{'xslt_file'});
+    if (!defined $full_file_path) {
+        print STDERR "Can not find $self->{'xslt_file'}, please make sure you have supplied the correct file path\n";
+        die "\n";
+    }
+    $self->{'xslt_file'} = $full_file_path;
     }
 
@@ -828 +833 @@
     my ($output_file_name, $xslt_file)=@_;
 
-   return unless defined $xslt_file and $xslt_file ne "" and -e $xslt_file;
-
+    return unless defined $xslt_file and $xslt_file ne "" and -e $xslt_file;
+    
     my $java_class_path =  &util::filename_cat ($ENV{'GSDLHOME'},"bin","java");
 
@@ -836 +841 @@
     if ($ENV{'GSDLOS'} eq "windows"){
     $java_class_path .=";".&util::filename_cat ($ENV{'GSDLHOME'},"bin","java","xalan.jar");
-    $xslt_file = "\"file:///".$xslt_file."\"";
-    $mapping_file_path = "\"file:///";
+    # this file:/// bit didn't work for me on windows XP
+    #$xslt_file = "\"file:///".$xslt_file."\"";
+    #$mapping_file_path = "\"file:///";
     }
     else{
@@ -852 +858 @@
     $cmd .= "-m $mapping_file_path";
     }
-
+    
     open(*XMLWRITER, $cmd)
     or die "can't open pipe to xslt: $!";