Changeset 26094 for main/trunk/greenstone2
- Timestamp:
- 2012-08-09T17:20:51+12:00 (12 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/basebuilder.pm
r25958 r26094 560 560 } 561 561 } 562 563 # store the number of indexes built to later determine whether search serviceracks get written out to buildConfig.xml 564 $build_cfg->{'num_indexes'} = scalar (@indexmap); 565 562 566 $build_cfg->{'indexmap'} = \@indexmap if scalar (@indexmap); 563 567 -
main/trunk/greenstone2/perllib/buildConfigxml.pm
r25758 r26094 273 273 } 274 274 } else { 275 print STDERR "$maptype not defined"; 276 } 277 275 print STDERR "$maptype not defined\n"; 276 } 277 278 $settings->{'num_indexes'} = $buildcfg->{'num_indexes'}; 278 279 $settings->{'defaultindex'} = $defaultindex; 279 280 $settings->{'indexmap'} = $indexmap; … … 352 353 } 353 354 # the default level assigned by the user is no longer ignored [Shaoqun], but the retrievel level stays the same. 354 #if (defined $collectcfg->{"defaultlevel"}) {355 $default_search_level = $levelmap->{$collectcfg->{"defaultlevel"}};355 if (defined $collectcfg->{"defaultlevel"}) { 356 $default_search_level = $levelmap->{$collectcfg->{"defaultlevel"}}; 356 357 # $default_retrieve_level = $default_search_level; 357 #}358 } 358 359 359 360 if (defined $buildcfg->{'textlevel'}) { … … 366 367 $settings->{'levelmap'} = $levelmap; 367 368 $settings->{'levellist'} = $levellist; 368 $settings->{'default_search_level'} = $default_search_level ;369 $settings->{'default_search_level'} = $default_search_level if $default_search_level; 369 370 $settings->{'default_retrieve_level'} = $default_retrieve_level; 370 371 $settings->{'default_db_level'} = $default_db_level; … … 383 384 my $service_type = $settings->{'service_type'}; 384 385 386 # there's no searching and therefore no search services if there are no indexes 387 return if($settings->{'num_indexes'} <= 0); 388 385 389 # do the search service 386 390 &write_line('COLCFG', ["<serviceRack name=\"GS2", $service_type, "Search\">"]); … … 523 527 my ($buildcfg,$settings) = @_; 524 528 529 #return if($settings->{'num_indexes'} <= 0); # no search if no indexes 530 525 531 my $infodbtype = $settings->{'infodbtype'}; 526 532
Note:
See TracChangeset
for help on using the changeset viewer.