[xwiki-notifications] r7920 - xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist

[SVN]

Author: jvdrean
Date: 2008-02-22 18:34:17 +0100 (Fri, 22 Feb 2008)
New Revision: 7920

Modified:
   
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
   
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
Log:
XPWATCHLIST-12 : Global user can't watch sub-wiki's documents

Modified: 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2008-02-22 16:08:43 UTC (rev 7919)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2008-02-22 17:34:17 UTC (rev 7920)
@@ -179,7 +179,7 @@
 
         if (query.length() > 0) {
             List queryDocuments =
-                plugin.globalSearchDocuments(query, new ArrayList(), xcontext, 
xwiki);
+                plugin.globalSearchDocuments(query, 0, 0, new ArrayList(), 
xcontext, xwiki);
             watchedDocuments.addAll(queryDocuments);
         }
 
@@ -235,7 +235,7 @@
                 + WatchListPlugin.WATCHLIST_CLASS +
                 "' and prop.id.id=obj.id and prop.name='interval' " +
                 "and prop.value='" + interval + "')";
-        return plugin.globalSearchDocuments(request, new ArrayList(), 
xcontext, xwiki);
+        return plugin.globalSearchDocuments(request, 0, 0, new ArrayList(), 
xcontext, xwiki);
     }
 
     /**
@@ -269,7 +269,7 @@
         values.add(dt.toDate());
         String updatedDocumentRequest = "where doc.date > ? order by doc.date 
desc";
 
-        return plugin.globalSearchDocuments(updatedDocumentRequest, values, 
xcontext, xwiki);
+        return plugin.globalSearchDocuments(updatedDocumentRequest, 0, 0, 
values, xcontext, xwiki);
     }
 
     /**

Modified: 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
      2008-02-22 16:08:43 UTC (rev 7919)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
      2008-02-22 17:34:17 UTC (rev 7920)
@@ -543,7 +543,8 @@
         String request = "select doc.fullName from XWikiDocument as doc where 
doc.web in ('" +
             watchedSpaces + "') or doc.fullName in ('" + watchedDocuments + 
"') " +
             "order by doc.date desc";
-        return context.getWiki().getStore().search(request, 20, 0, context);
+        return globalSearchDocuments(request, 20, 0, new ArrayList(), new 
Context(context),
+            new XWiki(context.getWiki(), context));
     }
 
     /**
@@ -590,7 +591,8 @@
      * @return a list of document names prefixed with the wiki they come from 
ex :
      *         xwiki:Main.WebHome
      */
-    protected List globalSearchDocuments(String request, List values, Context 
context, XWiki xwiki)
+    protected List globalSearchDocuments(String request, int nb, int start, 
List values,
+        Context context, XWiki xwiki)
     {
         String initialDb =
             !context.getDatabase().equals("") ? context.getDatabase() :
@@ -618,7 +620,8 @@
                 String wikiPrefix = wiki + ":";
                 context.setDatabase(wiki);
                 try {
-                    List upDocsInWiki = xwiki.searchDocuments(request, 0, 0, 
values);
+                    // List upDocsInWiki = xwiki.searchDocuments(request, 0, 
0, values);
+                    List upDocsInWiki = xwiki.searchDocumentsNames(wiki, 
request, 0, 0, values);
                     Iterator it = upDocsInWiki.iterator();
                     while (it.hasNext()) {
                         results.add(wikiPrefix + it.next());
@@ -641,8 +644,9 @@
     {
         String request = ", BaseObject as obj where obj.name=doc.fullName and 
obj.className='"
             + WatchListPlugin.WATCHLIST_CLASS + "'";
-        List subscribers = globalSearchDocuments(request, new ArrayList(), new 
Context(context),
-            new XWiki(context.getWiki(), context));
+        List subscribers =
+            globalSearchDocuments(request, 0, 0, new ArrayList(), new 
Context(context),
+                new XWiki(context.getWiki(), context));
         Iterator it = subscribers.iterator();
         while (it.hasNext()) {
             String user = (String) it.next();

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