[jboss-svn-commits] JBL Code SVN: r10700 - labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository.

[jboss-svn-commits at lists.jboss.org]

Author: fmeyer
Date: 2007-04-02 17:06:18 -0400 (Mon, 02 Apr 2007)
New Revision: 10700

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
Log:
JBRULES-646 repository back-end that enables archiving for BRMS
Missed this file. 

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-04-02 18:29:31 UTC (rev 10699)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-04-02 21:06:18 UTC (rev 10700)
@@ -350,23 +350,28 @@
      * @param fieldPredicates A predicate string (SQL style).
      * @return A list of matches. 
      */
-    public AssetItemIterator queryAssets(String fieldPredicates) {
+    public AssetItemIterator queryAssets(String fieldPredicates, boolean seekArchived) {
         try {
 
             String sql = "SELECT * FROM " + AssetItem.RULE_NODE_TYPE_NAME;
-            sql += " WHERE jcr:path LIKE '" + getVersionContentNode().getPath() + "/" + ASSET_FOLDER_NAME + "[%]/%'";
-            
+            sql += " WHERE jcr:pathz LIKE '" + getVersionContentNode().getPath() + "/" + ASSET_FOLDER_NAME + "[%]/%'";
             sql += " and " + fieldPredicates;
             
+            if ( seekArchived == true ) sql += " AND " + AssetItem.CONTENT_PROPERTY_ARCHIVE_FLAG + " = 'false'";
+            
+            System.out.println(sql);
+            
             Query q = node.getSession().getWorkspace().getQueryManager().createQuery( sql, Query.SQL );
             QueryResult res = q.execute();            
             return new AssetItemIterator(res.getNodes(), this.rulesRepository);        
         } catch ( RepositoryException e ) {
             throw new RulesRepositoryException(e);
         }
-        
     }
     
+    public AssetItemIterator queryAssets(String fieldPredicates){
+        return queryAssets( fieldPredicates, true );
+    }
     /**
      * This will load an iterator for assets of the given format type.
      */
@@ -381,9 +386,7 @@
             }
             predicate = predicate + " ) ";
             return queryAssets( predicate );
-            
         }
-        
     }
     
     /**
@@ -453,9 +456,6 @@
             throw new RulesRepositoryException( e );
         }
     }
-
-
-
     
     /**
      * This will return a list of assets for a given state.
@@ -486,8 +486,6 @@
                 //ignore this one
             } 
             else {
-                
-                
                 List fullHistory = new ArrayList();
                 for ( Iterator iter = head.getHistory(); iter.hasNext(); ) {
                     AssetItem element = (AssetItem) iter.next();