Show
Ignore:
Timestamp:
29.07.2009 13:22:28 (11 years ago)
Author:
kjdon
Message:

use colcfg read_collection/building_cfg methods instead of switching on gs_mode.

Files:
1 modified

Legend:

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

    r19625 r20098  
    382382    # Read in the collection configuration file. 
    383383    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 
    384          
    385      
    386     # Read in the collection configuration file. 
    387     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 
    388      
    389     if ($gs_mode eq "gs2") { 
    390     $collectcfg = &colcfg::read_collect_cfg ($configfilename); 
    391     } elsif ($gs_mode eq "gs3") { 
    392     $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename); 
    393     } 
    394  
     384    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 
     385     
    395386    if (defined $collectcfg->{'importdir'} && $importdir eq "") { 
    396387    $importdir = $collectcfg->{'importdir'}; 
     
    648639    $doc_obj->add_utf8_metadata($section,$md_label, $val); 
    649640     
    650     # see cfgread4gs3.pm: GS2's "collectionextra" is called "description" in GS3, 
     641    # see collConfigxml.pm: GS2's "collectionextra" is called "description" in GS3, 
    651642    # while "collectionname" in GS2 is called "name" in GS3. 
    652     # Variable $nameMap variable in cfgread4gs3.pm maps between GS2 and GS3 
     643    # Variable $nameMap variable in collConfigxml.pm maps between GS2 and GS3 
    653644    if (($md_label eq "ex.collectionname^en") || ($md_label eq "ex.collectionname")) 
    654645    {