Changeset 20321

Timestamp:

2009-08-18T16:50:01+12:00 (15 years ago)

Author:

kjdon

Message:

use util::locate_config_file instead of hard coding linux paths, for mapping_file and xslt_file. made it work on windows

File:

• gsdl/trunk/perllib/plugouts/MARCXMLPlugout.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugouts/MARCXMLPlugout.pm

@@ -49 +49 @@
            'desc' => "{MARCXMLPlugout.mapping_file}",
            'type' => "string",
-           'deft' => "$ENV{'GSDLHOME'}/etc/dc2marc-mapping.xml",
+           'deft' => "dc2marc-mapping.xml",
            'reqd' => "yes",    
+           'hiddengli' => "no"},
+         { 'name' => "xslt_file", 
+           'desc' => "{BasPlugout.xslt_file}",
+           'type' => "string",
+           'reqd' => "no",
+           'deft' => "dc2marc.xsl",
            'hiddengli' => "no"}
+
                 ];
 
@@ -72 +79 @@
 
     $self->{'buffered_output'} ="";
-
-    if (!defined $self->{'mapping_file'} ||  (defined $self->{'mapping_file'} && $self->{'mapping_file'} eq "")){
-    $self->{'mapping_file'} = "$ENV{'GSDLHOME'}/etc/dc2marc-mapping.xml";
-    }
-    
-    if (!defined $self->{'xslt_file'} || (defined $self->{'xslt_file'} && $self->{'xslt_file'} eq "")){
-    $self->{'xslt_file'} = "$ENV{'GSDLHOME'}/etc/dc2marc.xsl";
+     
+    my $full_path_to_mapping_file = &util::locate_config_file($self->{'mapping_file'});
+    if (! defined $full_path_to_mapping_file) {
+    print STDERR "Can not find $self->{'mapping_file'}, please make sure you have supplied the correct file path\n";
+    die "\n";
     }
-  
-    if(defined $self->{'mapping_file'} &&  $self->{'mapping_file'} ne "")
-    {
-    print STDERR "Can not find $self->{'mapping_file'}, please make sure you have supplied the correct file path\n" and  die "\n" unless (-e $self->{'mapping_file'});
-    }
-
-    if(defined $self->{'xslt_file'} &&  $self->{'xslt_file'} ne "")
-    {
-    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'});
-    }
+    $self->{'mapping_file'} = $full_path_to_mapping_file;
 
    return bless $self, $class;
@@ -112 +108 @@
 
     my $output_file = util::filename_cat ($working_dir, "marc.xml");
-
+ 
     $self->open_xslt_pipe($output_file,$self->{'xslt_file'});
 
@@ -157 +153 @@
 
     my $output_file = util::filename_cat($output_dir, "marc.xml");
-
+ 
     $self->open_xslt_pipe($output_file,$self->{'xslt_file'});