r1571 - xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-15 15:32:32 +0100 (Wed, 15 Nov 2006)
New Revision: 1571

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/SearchResults.java
Log:
* check the rights before sending the response

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/SearchResults.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/SearchResults.java	2006-11-15 11:59:45 UTC (rev 1570)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/SearchResults.java	2006-11-15 14:32:32 UTC (rev 1571)
@@ -74,18 +74,16 @@
                 try
                 {
                     result = new SearchResult (hits.doc (i), hits.score (i), xwiki);
-                } catch (Exception e)
-                {
+                    String pageName = null;
+                    if (result.isWikiContent ())
+                        pageName = result.getWeb () + "." + result.getName ();
+                    if (result != null && result.isWikiContent() && xwiki.checkAccess (pageName, "view")) {
+                        relevantResults.add (result);
+                    }
+                } catch (Exception e) {
                     LOG.error ("error getting search result", e);
                     e.printStackTrace ();
                 }
-                if (result != null
-                        && (!result.isWikiContent () || xwiki
-                                .checkAccess (new StringBuffer (result.getWeb ()).append (".")
-                                        .append (result.getName ()).toString (), "view")))
-                {
-                    relevantResults.add (result);
-                }
             }
         }
         return relevantResults;