Changeset 25774

Timestamp:

2012-06-06T20:52:11+12:00 (12 years ago)

Author:

ak19

Message:

Collections that are built without a search index, as is the backdrop tutorial collection based on image-e, should not produce a search form. So far a search form was appearing anyway and crashed when a search was attempted (because it wasn't built on any indexes).

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -357 +357 @@
     
     <!-- ***** QUICK SEARCH AREA ***** -->
+    <!-- Search form should only appear if there's a search (query) service AND it has an index. 
+         By default, all collections end up with some query service (default is MGPP) even when they have
+         no search indexes, which is why the extra test for the presence of an index is necessary. -->
     <xsl:template name="quick-search-area">
-        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']">
+        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']/paramList/param[@name='index']">
             <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/>
             <td id="quicksearcharea">