Changeset 20319

Timestamp:

2009-08-18T16:38:36+12:00 (15 years ago)

Author:

kjdon

Message:

changed MARC to MARCXML, check whether some args are non empty before passing to plugouts

File:

• gsdl/trunk/bin/script/export.pl (modified) (3 diffs)

gsdl/trunk/bin/script/export.pl

@@ -491 +491 @@
     if ($saveas eq "DSpace"){
     $expinfo_doc_filename = &util::filename_cat ($exportdir, "contents");
-    } elsif ($saveas =~ m/^.*METS$/ || $saveas eq "MARC" ) {
+    } elsif ($saveas =~ m/^.*METS$/ || $saveas eq "MARCXML" ) {
 ##  $expinfo_doc_filename = &util::filename_cat ($exportdir, "export.inf");
     my $doc_db = "archiveinf-doc";
@@ -523 +523 @@
     push @$plugout,("-gzip_output",$gzip) if (defined $gzip);
     push @$plugout,("-output_handle",$out) if (defined $out);
-    push @$plugout,("-xslt_file",$xsltfile) if (defined $xsltfile);
+    push @$plugout,("-xslt_file",$xsltfile) if (defined $xsltfile && $xsltfile ne "");
     push @$plugout,("-group") if ($group_marc && $plugout_name =~ m/^MARCXMLPlugout$/);
-    push @$plugout,("-mapping_file",$mapping_file) if (defined $mapping_file && $plugout_name =~ m/^MARCXMLPlugout$/);
-    push @$plugout,("-xslt_mets",$xslt_mets) if (defined $xslt_mets && $plugout_name =~ m/^.*METSPlugout$/);
-    push @$plugout,("-xslt_txt",$xslt_txt) if (defined $xslt_txt && $plugout_name =~ m/^.*METSPlugout$/);
-    push @$plugout,("-fedora_namespace",$fedora_namespace) if (defined $fedora_namespace && $plugout_name eq "FedoraMETSPlugout");
+    push @$plugout,("-mapping_file",$mapping_file) if (defined $mapping_file && $mapping_file ne "" && $plugout_name =~ m/^MARCXMLPlugout$/);
+    push @$plugout,("-xslt_mets",$xslt_mets) if (defined $xslt_mets && $xslt_mets ne "" && $plugout_name =~ m/^.*METSPlugout$/);
+    push @$plugout,("-xslt_txt",$xslt_txt) if (defined $xslt_txt && $xslt_txt ne "" && $plugout_name =~ m/^.*METSPlugout$/);
+    push @$plugout,("-fedora_namespace",$fedora_namespace) if (defined $fedora_namespace && $fedora_namespace ne "" && $plugout_name eq "FedoraMETSPlugout");
     
     $processor = &plugout::load_plugout($plugout);    
@@ -579 +579 @@
     $processor->close_group_output() if $processor->is_group();
 
-    if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARC")) {
+    if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARCXML")) {
     # Not all export types need this (e.g. DSpace)
     $export_info->save_info($expinfo_doc_filename);