Show
Ignore:
Timestamp:
17.02.2009 15:36:44 (11 years ago)
Author:
davidb
Message:

OIDmetadata wasn't supported in collect.cfg, but OIDtype was. Now rectified. Also introduced OIDcount as a file saved in the archives folder to help doc.pm use the correct value when working incrementally

Files:
1 modified

Legend:

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

    r18507 r18528  
    197197    'desc' => "{import.OIDmetadata}", 
    198198    'type' => "metadata", 
    199     'deft' => "dc.Identifier", 
     199    # parsearg left "" as default 
     200    #'deft' => "dc.Identifier", 
    200201    'reqd' => "no", 
    201202    'modegli' => "2" }, 
     
    440441    } 
    441442 
     443    if ((!defined $OIDmetadata) || ($OIDmetadata eq "")) { 
     444    if (defined $collectcfg->{'OIDmetadata'}) { 
     445        $OIDmetadata = $collectcfg->{'OIDmetadata'}; 
     446    } else { 
     447        $OIDmetadata = "dc.Identifier"; # the default 
     448    } 
     449    } 
     450 
    442451    if (defined $collectcfg->{'sortmeta'} && (!defined $sortmeta || $sortmeta eq "")) { 
    443452    $sortmeta = $collectcfg->{'sortmeta'}; 
     
    575584 
    576585    if (!$removeold) { 
     586 
     587        &inexport::prime_doc_oid_count($archivedir); 
     588 
     589 
    577590        # Can now work out which files were new, already existed, and have 
    578591        # been deleted 
     
    620633    &plugin::deinit($pluginfo, $processor); 
    621634 
     635    # Store the value of OIDCount (used in doc.pm) so it can be 
     636    # restored correctly to this value on an incremental build 
     637    &inexport::store_doc_oid_count($archivedir); 
     638 
    622639    # write out the archive information file 
    623640    $processor->close_file_output() if $groupsize > 1;