Changeset 14385

Timestamp:

2007-08-28T09:03:29+12:00 (17 years ago)

Author:

anna

Message:

Changed paramList template so that don't generate the search level drop down list if the level param is invisible. Added namespace prefix in hidden placeholder of a param in the param(multi, contents) template, to make the AdvancedFieldSearch work.

File:

• greenstone3/trunk/web/interfaces/classic/transform/query-common.xsl (modified) (4 diffs)

greenstone3/trunk/web/interfaces/classic/transform/query-common.xsl

@@ -29 +29 @@
   <xsl:template match="paramList" priority='2'>
     <span class="textselect">
-      Search for <xsl:apply-templates select="param[@name='index']"><xsl:with-param name="default"><xsl:apply-templates select="param[@name='index']" mode="calculate-default"/></xsl:with-param></xsl:apply-templates><xsl:if test="param[@name='level']">at <xsl:apply-templates select="param[@name='level']"><xsl:with-param name="default"><xsl:apply-templates select="param[@name='level']" mode="calculate-default"/></xsl:with-param></xsl:apply-templates> level</xsl:if><xsl:call-template name='query_mode'/>
+      Search for <xsl:apply-templates select="param[@name='index']"><xsl:with-param name="default"><xsl:apply-templates select="param[@name='index']" mode="calculate-default"/></xsl:with-param></xsl:apply-templates><xsl:if test="param[@name='level' and not(@type='invisible')]">at <xsl:apply-templates select="param[@name='level']"><xsl:with-param name="default"><xsl:apply-templates select="param[@name='level']" mode="calculate-default"/></xsl:with-param></xsl:apply-templates> level</xsl:if><xsl:call-template name='query_mode'/>
     </span> 
     <span class="querybox"> 
@@ -68 +68 @@
     </xsl:choose>
   </xsl:template>
-
+   
   <xsl:template match="param[@name='matchMode']" mode='query1'>
    <xsl:param name='default'/>
@@ -134 +134 @@
   <xsl:template match="param[@type='multi']" mode="contents">
     <xsl:param name="occurs"/>
+    <xsl:param name="ns">s1.</xsl:param>
     <xsl:param name="pos"/>
  <!--   <xsl:variable name="pos" select="@occurs - $occurs"/>-->
@@ -144 +145 @@
         </xsl:when>
         <xsl:otherwise><!-- put in a hidden placeholder -->
-          <input type="hidden" name='{@name}' value=''/>
+          <input type="hidden" name='{$ns}{@name}' value=''/>
         </xsl:otherwise>
       </xsl:choose></td>