You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2007/01/12 00:35:11 UTC

svn commit: r495430 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html: solr-actionbar.ft solr-search.ft

Author: thorsten
Date: Thu Jan 11 15:35:09 2007
New Revision: 495430

URL: http://svn.apache.org/viewvc?view=rev&rev=495430
Log:
Enhancing support for forrest run as non ROOT servlet. Checking for empty string to get rid of some errors thrown by the cli crawler.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft?view=diff&rev=495430&r1=495429&r2=495430
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-actionbar.ft Thu Jan 11 15:35:09 2007
@@ -48,12 +48,10 @@
       <xsl:template match="/">
         <xsl:variable name="context">
           <xsl:choose>
-            <xsl:when test="$contextPath!=''">
+            <xsl:when test="$contextPath!='' and $contextPath!=' '">       
               /<xsl:value-of select="$contextPath"/>/
             </xsl:when>
-            <xsl:otherwise>
-              /
-            </xsl:otherwise>
+            <xsl:otherwise>/</xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
         <forrest:content>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft?view=diff&rev=495430&r1=495429&r2=495430
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solr-search.ft Thu Jan 11 15:35:09 2007
@@ -48,7 +48,7 @@
       <xsl:template match="/">
         <xsl:variable name="action">
           <xsl:choose>
-            <xsl:when test="$contextPath!=''">
+            <xsl:when test="$contextPath!='' and $contextPath!=' '">
               /<xsl:value-of select="$contextPath"/>/solr-search.html
             </xsl:when>
             <xsl:otherwise>
@@ -58,7 +58,7 @@
         </xsl:variable>
         <forrest:content>
           <forrest:part>
-            <form action="{normalize-space($action)}" method="get" name="solr-search">
+            <form action="{normalize-space($action)}" method="post" name="solr-search">
               <div class="searchHidden">
                 <input name="version" type="hidden" value="2.2"/>
                 <xsl:copy-of select="$hidden/*"/>