Changeset 26057

Timestamp:

2012-08-01T16:07:03+12:00 (12 years ago)

Author:

ak19

Message:

Fixed side-effect bug I accidentally introduced in a previous commit which made the appearance of the FieldSearch and AdvancedSearch queries dependent on the presence of TextQuery, because an index in TextQuery is called index and indexes in the other 2 types of queries are called fq-something. Fixed this now.

File:

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

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

@@ -358 +358 @@
     <!-- 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. -->
+         no search indexes, which is why the extra test for the presence of an index/fq-something is necessary. -->
     <xsl:template name="quick-search-area">
-        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']/paramList/param[@name='index']">
+        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']/paramList/param[@name='index' or fn:starts-with('fq')]">
             <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/>
             <div id="quicksearcharea">
@@ -412 +412 @@
                         </span>
                     </xsl:if>
-                    <!-- The submit button -->
+                    <!-- The submit button (for TextQuery) -->
+                    <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']">
                     <input type="submit" id="quickSearchSubmitButton">
                         <xsl:attribute name="value">
@@ -419 +420 @@
                     </input>
                     <br/>
+                    </xsl:if>
                     <!-- The list of other search types -->
                     <ul>