svn commit: r945733 - in /portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view: generic-search-query-content-view.jsp simple-search-query-content-help.jsp simple-search-query-content-view.jsp

[wo...@apache.org]

Author: woonsan
Date: Tue May 18 16:17:18 2010
New Revision: 945733

URL: http://svn.apache.org/viewvc?rev=945733&view=rev
Log:
Fixing pagination problem in search portlets and adding more examples in the help page of the simple search portlet.

Modified:
    portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp
    portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
    portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-view.jsp

Modified: portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp?rev=945733&r1=945732&r2=945733&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp (original)
+++ portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp Tue May 18 16:17:18 2010
@@ -90,8 +90,12 @@ Pages: 
     </c:when>
     <c:otherwise>
       <portlet:renderURL var="pageURL">
+        <portlet:param name="query" value="${query}"/>
+        <portlet:param name="queryNode" value="${queryNode}"/>
+        <portlet:param name="queryOperator" value="${queryOperator}"/>
+        <portlet:param name="queryJcrExpression" value="${queryJcrExpression}"/>
         <portlet:param name="page" value="${index}"/>
-      </portlet:renderURL>
+       </portlet:renderURL>
       <a href="${pageURL}">${index}</a>
     </c:otherwise>
   </c:choose>

Modified: portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp?rev=945733&r1=945732&r2=945733&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp (original)
+++ portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp Tue May 18 16:17:18 2010
@@ -90,3 +90,55 @@ limitations under the License.
     </td>
   </tr> 
 </table>
+
+<p>&nbsp;</p>
+
+<h2>All documents of 'onehippo:document' type under /jcr:root/content/documents/en/ folder with full text search by 'cms' on @onehippo:title:</h2>
+<table>
+  <tr>
+    <td class="portlet-section-body">
+      <code>
+        /jcr:root/content/documents/en//element(*, onehippo:document) [jcr:contains(@onehippo:title, 'cms')]
+      </code>
+    </td>
+  </tr> 
+</table>
+
+<p>&nbsp;</p>
+
+<h2>All documents of 'onehippo:document' type under /jcr:root/content/documents/en/ folder with full text search by 'cms' on @onehippo:title and @hippostd:state property has 'published' value:</h2>
+<table>
+  <tr>
+    <td class="portlet-section-body">
+      <code>
+        /jcr:root/content/documents/en//element(*, onehippo:document) [jcr:contains(@onehippo:title, 'cms') and @hippostd:state = 'published']
+      </code>
+    </td>
+  </tr> 
+</table>
+
+<p>&nbsp;</p>
+
+<h2>All documents of 'onehippo:document' type under /jcr:root/content/documents/en/ folder with full text search by 'cms' on @onehippo:title and @hippostd:state property value is not 'published':</h2>
+<table>
+  <tr>
+    <td class="portlet-section-body">
+      <code>
+        /jcr:root/content/documents/en//element(*, onehippo:document) [jcr:contains(@onehippo:title, 'cms') and @hippostd:state != 'published']
+      </code>
+    </td>
+  </tr> 
+</table>
+
+<p>&nbsp;</p>
+
+<h2>All documents of 'onehippo:document' type under /jcr:root/content/documents/en/ folder with full text search by 'cms' on @onehippo:title and @onehippo:documentdate property value is greater than January 1, 2009:</h2>
+<table>
+  <tr>
+    <td class="portlet-section-body">
+      <code>
+        /jcr:root/content/documents/en//element(*, onehippo:document) [jcr:contains(@onehippo:title, 'cms') and @onehippo:documentdate > xs:dateTime('2009-01-01T00:00:00.000Z')]
+      </code>
+    </td>
+  </tr> 
+</table>

Modified: portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-view.jsp?rev=945733&r1=945732&r2=945733&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-view.jsp (original)
+++ portals/applications/sandbox/content/trunk/src/main/webapp/WEB-INF/view/simple-search-query-content-view.jsp Tue May 18 16:17:18 2010
@@ -61,6 +61,7 @@ Pages: 
     </c:when>
     <c:otherwise>
       <portlet:renderURL var="pageURL">
+        <portlet:param name="fullQueryJcrExpression" value="${fullQueryJcrExpression}"/>
         <portlet:param name="page" value="${index}"/>
       </portlet:renderURL>
       <a href="${pageURL}">${index}</a>