[xwiki-notifications] r7872 - xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/Main

[SVN]

Author: tmortagne
Date: 2008-02-20 15:06:54 +0100 (Wed, 20 Feb 2008)
New Revision: 7872

Modified:
   
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/Main/LuceneSearch
Log:
XE-199: Lucene search space filter does not take into account searched string

Modified: 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/Main/LuceneSearch
===================================================================
--- 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/Main/LuceneSearch
     2008-02-20 14:06:23 UTC (rev 7871)
+++ 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/Main/LuceneSearch
     2008-02-20 14:06:54 UTC (rev 7872)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1186588178000</creationDate>
-<date>1197046413000</date>
-<contentUpdateDate>1197046413000</contentUpdateDate>
-<version>24.1</version>
+<date>1203516201000</date>
+<contentUpdateDate>1203516201000</contentUpdateDate>
+<version>4.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -25,8 +25,8 @@
 <filename>previous.png</filename>
 <filesize>389</filesize>
 <author>XWiki.Admin</author>
-<date>1196849577000</date>
-<version>1.4</version>
+<date>1199724183000</date>
+<version>1.5</version>
 <comment></comment>
 
<content>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEXSURBVDjLY/j//z8DJZiBLgZkz37Ynjrz4ReyDEideb89afrDf5ET7v4n2YCEqXf7qpY9/T9r76v/Xu03STMgasLteaVLHv+fufvl/6k7X/y3qrlCvAHBvTeXFC54ANbctv7p/95Nz/5rFZ0nzoCAzpuPsuc++D91x4v/jasf/y9aeP9/89rH/6VTTxJngGPDtc3xU+/879789H/5kgf/02fd+V+17OF/yZhjxBmgVXCaRT3v7BqP1mv/a1Y+/J824/b/woX3/osHHSAtECVjjqy0Lb/wP2/+3f+Zs+/8F3XfS3o0inntXWSeffJ/0tRb/0Ucdv4nKyEJW25ZYBh/5L+w5fb/ZCdlQYMNs4WMt/wfuMyEDwMA0Irn/pDRT58AAAAASUVORK5CYII=</content>
 </attachment>
@@ -34,8 +34,8 @@
 <filename>next.png</filename>
 <filesize>395</filesize>
 <author>XWiki.Admin</author>
-<date>1196849577000</date>
-<version>1.4</version>
+<date>1199724183000</date>
+<version>1.5</version>
 <comment></comment>
 
<content>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEdSURBVDjLY/j//z8DJZiB6gY0rH7xpW7li3YKDHj1v2bli38lix61k2VA5fJn/9eeeP+/fcOL/wlT7/aRbEDegkf/Vxx/93/xobf/S5c8/u/ecm0eSQYkTX/4f+HBN/8nbX/xf+bul/8Tp9/9r1N0dgnRBgT33QZqfPW/YdXj/42rH//v2vjkv3fHtf9SScceEWWAc8u1/xO2Pv9fsvjB//IlD4CGPPrvXH/5v2Tksc1EGWBaful/+/on/4sW3gfGxsP/9lUX/ksEH1gj6rqdhSgDlPPO/q9b8fB/5bIH/23LL/wXD9i7kqRAlEo6+b908f3/NiXn/4t57V1EcjRKRB75b1145r+o684FZCUkMb8D/0Uct88euMxEKgYA7Ojrv4CgE7EAAAAASUVORK5CYII=</content>
 </attachment>
@@ -102,7 +102,7 @@
 ## ---------------
 #if($request.space &amp;&amp; $request.space != "")
   #set($space = $request.space)
-  #set($reqspace = "AND web:${space}")
+  #set($reqspace = " AND web:${space}")
 #else
   #set($space = "")
 #end
@@ -233,37 +233,37 @@
                #set($searchresults = 
$lucene.getSearchResults("${query}$!{reqspace}", $wikinames, $languages, 
$xwiki))
                 #set($results = 
$searchresults.getResults($firstIndex,$itemsPerPage))
                #if($searchresults.getHitcount()&gt;0)
-                        ## -----------------
-                        ## Results numbers
-                        ## -----------------
-                        
#set($lastIndex=$searchresults.getEndIndex($firstIndex, $itemsPerPage))
-                        #if ($displayUI)
-                       #if($searchresults.getHitcount()==1)
-                               One result:
-                       #else
-                               Results $firstIndex - $lastIndex of 
${searchresults.getHitcount()}:
-                       #end
-                        #end
-                        ## ---------------
-                        ## Previous page
-                        ## ---------------
-                       #if($searchresults.hasPrevious($firstIndex) &amp;&amp; 
$displayUI)
-                               #set($linkfirstIndex = 
$searchresults.getPreviousIndex($firstIndex,$itemsPerPage))
-                               #set($link = 
"${doc.name}?text=${query}&amp;firstIndex=${linkfirstIndex}")
-                                {pre}
-                               &lt;a href="$link"&gt;&lt;img 
src="${doc.getAttachmentURL("previous.png")}" alt="previous" /&gt;previous 
page&lt;/a&gt;
-                               {/pre}
-                       #end            
-                        ## -------------
-                        ## Next page
-                        ## -------------
-                       #if($searchresults.hasNext($firstIndex,$itemsPerPage) 
&amp;&amp; $displayUI)
-                               #set($linkfirstIndex = 
$searchresults.getNextIndex($firstIndex,$itemsPerPage))
-                               #set($link = 
"${doc.name}?text=${query}&amp;firstIndex=${linkfirstIndex}")
-                                {pre}
-                               &lt;a href="$link"&gt;&lt;img 
src="${doc.getAttachmentURL("next.png")}" alt="next" /&gt;next page&lt;/a&gt;
-                                {/pre}
+                        ## -----------------
+                        ## Results numbers
+                        ## -----------------
+                        
#set($lastIndex=$searchresults.getEndIndex($firstIndex, $itemsPerPage))
+                        #if ($displayUI)
+                       #if($searchresults.getHitcount()==1)
+                               One result:
+                       #else
+                               Results $firstIndex - $lastIndex of 
${searchresults.getHitcount()}:
                        #end
+                        #end
+                        ## ---------------
+                        ## Previous page
+                        ## ---------------
+                       #if($searchresults.hasPrevious($firstIndex) &amp;&amp; 
$displayUI)
+                               #set($linkfirstIndex = 
$searchresults.getPreviousIndex($firstIndex,$itemsPerPage))
+                               #set($link = 
"${doc.name}?text=${query}&amp;firstIndex=${linkfirstIndex}")
+                                {pre}
+                               &lt;a href="$link"&gt;&lt;img 
src="${doc.getAttachmentURL("previous.png")}" alt="previous" /&gt;previous 
page&lt;/a&gt;
+                               {/pre}
+                       #end            
+                        ## -------------
+                        ## Next page
+                        ## -------------
+                       #if($searchresults.hasNext($firstIndex,$itemsPerPage) 
&amp;&amp; $displayUI)
+                               #set($linkfirstIndex = 
$searchresults.getNextIndex($firstIndex,$itemsPerPage))
+                               #set($link = 
"${doc.name}?text=${query}&amp;firstIndex=${linkfirstIndex}")
+                                {pre}
+                               &lt;a href="$link"&gt;&lt;img 
src="${doc.getAttachmentURL("next.png")}" alt="next" /&gt;next page&lt;/a&gt;
+                                {/pre}
+                       #end
                         ## -----------------
                         ## Display results
                         ## -----------------

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications