Changeset 20098 for gsdl/trunk
- Timestamp:
- 2009-07-29T13:22:28+12:00 (15 years ago)
- Location:
- gsdl/trunk/bin/script
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/bin/script/buildcol.pl
r18590 r20098 360 360 my ($collectcfg, $buildtype); 361 361 ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 362 if ($gs_mode eq "gs2") { 363 $collectcfg = &colcfg::read_collect_cfg ($configfilename); 364 } elsif ($gs_mode eq "gs3") { 365 $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename); 366 } 362 $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 367 363 368 364 if ($verbosity !~ /\d+/) { -
gsdl/trunk/bin/script/explode_metadata_database.pl
r19754 r20098 213 213 # Read in the collection configuration file. 214 214 my ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR); 215 my $collectcfg; 216 if ($gs_mode eq "gs2") { 217 $collectcfg = &colcfg::read_collect_cfg ($configfilename); 218 } elsif ($gs_mode eq "gs3") { 219 $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename); 220 } 215 my $collectcfg = &colcfg::read_collect_cfg ($configfilename, $gs_mode); 221 216 $plugin_options_string = &get_plugin_options($collectcfg, $plugin); 222 217 } -
gsdl/trunk/bin/script/export.pl
r19625 r20098 382 382 # Read in the collection configuration file. 383 383 ($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 395 386 if (defined $collectcfg->{'importdir'} && $importdir eq "") { 396 387 $importdir = $collectcfg->{'importdir'}; … … 648 639 $doc_obj->add_utf8_metadata($section,$md_label, $val); 649 640 650 # see c fgread4gs3.pm: GS2's "collectionextra" is called "description" in GS3,641 # see collConfigxml.pm: GS2's "collectionextra" is called "description" in GS3, 651 642 # while "collectionname" in GS2 is called "name" in GS3. 652 # Variable $nameMap variable in c fgread4gs3.pm maps between GS2 and GS3643 # Variable $nameMap variable in collConfigxml.pm maps between GS2 and GS3 653 644 if (($md_label eq "ex.collectionname^en") || ($md_label eq "ex.collectionname")) 654 645 { -
gsdl/trunk/bin/script/import.pl
r19775 r20098 371 371 # Read in the collection configuration file. 372 372 ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 373 374 if ($gs_mode eq "gs2") { 375 $collectcfg = &colcfg::read_collect_cfg ($configfilename); 376 } elsif ($gs_mode eq "gs3") { 377 $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename); 378 } 373 $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 379 374 380 375 if (defined $collectcfg->{'importdir'} && $importdir eq "") { -
gsdl/trunk/bin/script/incremental-buildcol.pl
r19899 r20098 140 140 # (e.g. collect.cfg now says lucene, but build.cfg says mgpp) 141 141 142 my $buildcfg; 143 if ($gs_mode eq "gs2") { 144 $buildcfg = &colcfg::read_build_cfg ($build_cfg_filename); 145 } else { 146 $buildcfg = &colcfg::read_collection_cfg_xml($build_cfg_filename); 147 } 142 my $buildcfg = &colcfg::read_building_cfg ($build_cfg_filename, $gs_mode); 148 143 if ($buildcfg->{'buildtype'} ne $collectcfg->{'buildtype'}) { 149 144 print STDERR "*****\n";
Note:
See TracChangeset
for help on using the changeset viewer.