You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/08/28 10:00:33 UTC

svn commit: r689752 - /incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Author: cziegeler
Date: Thu Aug 28 01:00:32 2008
New Revision: 689752

URL: http://svn.apache.org/viewvc?rev=689752&view=rev
Log:
SLING-616 : Improve query - each topic has its own folder.

Modified:
    incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Modified: incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=689752&r1=689751&r2=689752&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java (original)
+++ incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Thu Aug 28 01:00:32 2008
@@ -1127,18 +1127,15 @@
             final QueryManager qManager = s.getWorkspace().getQueryManager();
             final StringBuffer buffer = new StringBuffer("/jcr:root");
             buffer.append(this.repositoryPath);
+            if ( topic != null ) {
+                buffer.append('/');
+                buffer.append(topic.replace('/', '.'));
+            }
             buffer.append("//element(*, ");
             buffer.append(this.getEventNodeType());
             buffer.append(") [not(@");
             buffer.append(EventHelper.NODE_PROPERTY_FINISHED);
             buffer.append(")");
-            if ( topic != null ) {
-                buffer.append(" and @");
-                buffer.append(EventHelper.NODE_PROPERTY_TOPIC);
-                buffer.append(" = '");
-                buffer.append(topic);
-                buffer.append("'");
-            }
             if ( locked != null ) {
                 if ( locked ) {
                     buffer.append(" and @jcr:lockOwner");