Changeset 20935

Show
Ignore:
Timestamp:
13.11.2009 10:02:48 (10 years ago)
Author:
davidb
Message:

import_file now comes back as full pathname (not just local name within collection). Code revised to take account of that.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/cgiactions/metadataaction.pm

    r20538 r20935  
    686686    my $metadata_xml_file; 
    687687 
     688    my $import_filename = undef; 
     689 
    688690    if (defined $docid) { 
    689691 
     
    693695    my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$docid); 
    694696 
    695     $import_file = $doc_rec->{'src-file'}->[0]; 
    696     } 
    697      
    698  
    699     my $import_filename = &util::filename_cat($collect_dir,$collect,$import_file); 
    700  
     697    # This now stores the full pathname 
     698    $import_filename = $doc_rec->{'src-file'}->[0]; 
     699    } 
     700    else { 
     701    $import_filename = &util::filename_cat($collect_dir,$collect,$import_file); 
     702    } 
    701703     
    702704    # figure out correct metadata.xml file