Changeset 26094
- Timestamp:
- 2012-08-09T17:20:51+12:00 (12 years ago)
- Location:
- main/trunk
- Files:
-
- 3 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 -
main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl
r26084 r26094 360 360 no search indexes, which is why the extra test for the presence of an index/fq-something is necessary. --> 361 361 <xsl:template name="quick-search-area"> 362 <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query'] /paramList/param[@name='index' or starts-with(@name, 'fq')]">362 <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']"> 363 363 <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/> 364 364 <div id="quicksearcharea"> 365 <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']"> 365 366 <form action="{$library_name}/collection/{$collNameChecked}/search/TextQuery"> 366 367 <!-- This parameter says that we have come from the quick search area --> … … 423 424 <br/> 424 425 </xsl:if> 426 </form> 427 </xsl:if> 428 425 429 <!-- The list of other search types --> 426 430 <ul> … … 436 440 </xsl:for-each> 437 441 </ul> 438 </form>439 442 </div> 440 443 </xsl:if>
Note:
See TracChangeset
for help on using the changeset viewer.