You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/08/17 10:20:33 UTC

svn commit: r1696209 - /jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp

Author: chetanm
Date: Mon Aug 17 08:20:33 2015
New Revision: 1696209

URL: http://svn.apache.org/r1696209
Log:
OAK-3237 - Configure default index definition for fulltext search

-- Use admin credentials to perform search as without that results are not getting listed
-- Fix spellcheck logic to ensure that absence of spellcheck support should not bring down whole search logic

Modified:
    jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp

Modified: jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp?rev=1696209&r1=1696208&r2=1696209&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/search.jsp Mon Aug 17 08:20:33 2015
@@ -37,7 +37,7 @@
     Session jcrSession;
     try {
         rep = RepositoryAccessServlet.getRepository(pageContext.getServletContext());
-        jcrSession = rep.login(new GuestCredentials());
+        jcrSession = rep.login(new SimpleCredentials("admin", "admin".toCharArray()));
     } catch (Throwable e) {
         %>Error while accessing the repository: <font color="red"><%= Text.encodeIllegalXMLCharacters(e.getMessage()) %></font><br><%
         %>Check the configuration or use the <a href="admin/">easy setup</a> wizard.<%
@@ -115,11 +115,14 @@
 
             if (total < 10 && !q.startsWith("related:")) {
                 try {
-                    Value v = jcrSession.getWorkspace().getQueryManager().createQuery(
+                    RowIterator spellResultItr = jcrSession.getWorkspace().getQueryManager().createQuery(
                             "/jcr:root[rep:spellcheck('" + q + "')]/(rep:spellcheck())",
-                            Query.XPATH).execute().getRows().nextRow().getValue("rep:spellcheck()");
-                    if (v != null) {
-                        suggestedQuery = v.getString();
+                            Query.XPATH).execute().getRows();
+                    if (spellResultItr.hasNext()){
+                        Value v = spellResultItr.nextRow().getValue("rep:spellcheck()");
+                        if (v != null) {
+                            suggestedQuery = v.getString();
+                        }
                     }
                 } catch (RepositoryException e) {
                     // ignore