Changeset 20319

Show
Ignore:
Timestamp:
18.08.2009 16:38:36 (11 years ago)
Author:
kjdon
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/export.pl

    r20098 r20319  
    491491    if ($saveas eq "DSpace"){ 
    492492    $expinfo_doc_filename = &util::filename_cat ($exportdir, "contents"); 
    493     } elsif ($saveas =~ m/^.*METS$/ || $saveas eq "MARC" ) { 
     493    } elsif ($saveas =~ m/^.*METS$/ || $saveas eq "MARCXML" ) { 
    494494##  $expinfo_doc_filename = &util::filename_cat ($exportdir, "export.inf"); 
    495495    my $doc_db = "archiveinf-doc"; 
     
    523523    push @$plugout,("-gzip_output",$gzip) if (defined $gzip); 
    524524    push @$plugout,("-output_handle",$out) if (defined $out); 
    525     push @$plugout,("-xslt_file",$xsltfile) if (defined $xsltfile); 
     525    push @$plugout,("-xslt_file",$xsltfile) if (defined $xsltfile && $xsltfile ne ""); 
    526526    push @$plugout,("-group") if ($group_marc && $plugout_name =~ m/^MARCXMLPlugout$/); 
    527     push @$plugout,("-mapping_file",$mapping_file) if (defined $mapping_file && $plugout_name =~ m/^MARCXMLPlugout$/); 
    528     push @$plugout,("-xslt_mets",$xslt_mets) if (defined $xslt_mets && $plugout_name =~ m/^.*METSPlugout$/); 
    529     push @$plugout,("-xslt_txt",$xslt_txt) if (defined $xslt_txt && $plugout_name =~ m/^.*METSPlugout$/); 
    530     push @$plugout,("-fedora_namespace",$fedora_namespace) if (defined $fedora_namespace && $plugout_name eq "FedoraMETSPlugout"); 
     527    push @$plugout,("-mapping_file",$mapping_file) if (defined $mapping_file && $mapping_file ne "" && $plugout_name =~ m/^MARCXMLPlugout$/); 
     528    push @$plugout,("-xslt_mets",$xslt_mets) if (defined $xslt_mets && $xslt_mets ne "" && $plugout_name =~ m/^.*METSPlugout$/); 
     529    push @$plugout,("-xslt_txt",$xslt_txt) if (defined $xslt_txt && $xslt_txt ne "" && $plugout_name =~ m/^.*METSPlugout$/); 
     530    push @$plugout,("-fedora_namespace",$fedora_namespace) if (defined $fedora_namespace && $fedora_namespace ne "" && $plugout_name eq "FedoraMETSPlugout"); 
    531531     
    532532    $processor = &plugout::load_plugout($plugout);     
     
    579579    $processor->close_group_output() if $processor->is_group(); 
    580580 
    581     if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARC")) { 
     581    if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARCXML")) { 
    582582    # Not all export types need this (e.g. DSpace) 
    583583    $export_info->save_info($expinfo_doc_filename);