Index: topia/src/java/org/codelutin/topia/persistence/AbstractPersistenceHelper.java
diff -u topia/src/java/org/codelutin/topia/persistence/AbstractPersistenceHelper.java:1.7 topia/src/java/org/codelutin/topia/persistence/AbstractPersistenceHelper.java:1.8
--- topia/src/java/org/codelutin/topia/persistence/AbstractPersistenceHelper.java:1.7	Wed Jun 15 16:52:29 2005
+++ topia/src/java/org/codelutin/topia/persistence/AbstractPersistenceHelper.java	Tue Jun 28 14:08:34 2005
@@ -23,10 +23,10 @@
  * Created: Jul 30, 2004
  *
  * @author Cédric Pineau <pineau@codelutin.com>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  *
- * Last update : $Date: 2005/06/15 16:52:29 $
- * by : $Author: thimel $
+ * Last update : $Date: 2005/06/28 14:08:34 $
+ * by : $Author: bpoussin $
  */
 
 package org.codelutin.topia.persistence;
@@ -75,6 +75,18 @@
     }
 
     public void destroy() { }
-    
+
+    public void beginTransaction() throws TopiaException {
+        throw new TopiaException("Transaction not supported");
+    }
+
+    public void commitTransaction() throws TopiaException {
+        throw new TopiaException("Transaction not supported");
+    }
+
+    public void rollbackTransaction() throws TopiaException {
+        throw new TopiaException("Transaction not supported");
+    }
+
 } // AbstractPersistenceHelper
 

Index: topia/src/java/org/codelutin/topia/persistence/PersistenceHelper.java
diff -u topia/src/java/org/codelutin/topia/persistence/PersistenceHelper.java:1.7 topia/src/java/org/codelutin/topia/persistence/PersistenceHelper.java:1.8
--- topia/src/java/org/codelutin/topia/persistence/PersistenceHelper.java:1.7	Fri Jun 10 17:16:38 2005
+++ topia/src/java/org/codelutin/topia/persistence/PersistenceHelper.java	Tue Jun 28 14:08:34 2005
@@ -23,10 +23,10 @@
  * Created: Aug 1, 2004
  *
  * @author Cédric Pineau <pineau@codelutin.com>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  *
- * Last update : $Date: 2005/06/10 17:16:38 $
- * by : $Author: thimel $
+ * Last update : $Date: 2005/06/28 14:08:34 $
+ * by : $Author: bpoussin $
  */
 
 package org.codelutin.topia.persistence;
@@ -70,7 +70,7 @@
     public AsynchronousLoader findAsynchronously(TopiaQuery query) throws TopiaException;
 
     /**
-     * Get a list of objects within a range for the given query. 
+     * Get a list of objects within a range for the given query.
      * @param query request to execute
      * @param startIndex index of the first element to return
      * @param endIndex index of the last element to return
@@ -79,7 +79,7 @@
     public List findInRange(TopiaQuery query, int startIndex, int endIndex) throws TopiaException;
 
     /**
-     * Get an asynchronous loader of objects within a range for the given query. 
+     * Get an asynchronous loader of objects within a range for the given query.
      * @param query request to execute
      * @param startIndex index of the first element to return
      * @param endIndex index of the last element to return
@@ -107,5 +107,22 @@
     public TopiaEntity findByTopiaId(String id) throws TopiaException;
 
     public void destroy();
-    
+
+    /**
+    * Ouvre une transaction pour le thread courant
+    * @throws TopiaException si le PersistenceHelper ne supporte pas les transaction
+    */
+    public void beginTransaction() throws TopiaException;
+
+    /**
+    * Commit les changements fait durant la transaction
+    * @throws TopiaException si aucune transaction ouverte pour le thread courant
+    */
+    public void commitTransaction() throws TopiaException;
+
+    /**
+    * Rollback les changements fait durant la transaction
+    * @throws TopiaException si aucune transaction ouverte pour le thread courant
+    */
+    public void rollbackTransaction() throws TopiaException;
 }

Index: topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java
diff -u topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.4 topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.5
--- topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.4	Tue Jun 21 17:00:43 2005
+++ topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java	Tue Jun 28 14:08:34 2005
@@ -24,12 +24,14 @@
 * Created: 13 juin 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.4 $
+* @version $Revision: 1.5 $
 */
 
 
 package org.codelutin.topia.persistence;
 
+import bsh.EvalError;
+import bsh.Interpreter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -38,11 +40,12 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import java.util.Map;
 import org.codelutin.queryparser.Constraint;
 import org.codelutin.queryparser.DefaultQueryVisitorUnsupportedOperation;
 import org.codelutin.queryparser.FieldPath;
@@ -55,9 +58,6 @@
 import org.codelutin.queryparser.Select;
 import org.codelutin.queryparser.Where;
 
-import bsh.EvalError;
-import bsh.Interpreter;
-
 /**
  * Cette classe permet d'effectuer des requêtes de type Query sur une
  * Collection d'objet par introspection.
@@ -69,24 +69,24 @@
 public class TopiaCollectionQueryHelper extends QueryHelper {
 
     /** to use log facility, just put in your code: log.info("..."); */
-    static private Logger log = 
+    static private Logger log =
         Logger.getLogger("org.codelutin.topia.TopiaCollectionQueryHelper");
-    
+
     protected TopiaCollectionQueryBuilder queryBuilder;
     protected Collection datas;
     protected Interpreter inter;
-    
+
     public TopiaCollectionQueryHelper(Collection datas) {
         this.datas = datas;
     }
-    
+
     public void setQuery(Query query) {
         super.setQuery(query);
         queryBuilder = null;
         HashMap fields = getQuery().getSelect().getFields();
         if(fields.size() != 1)
             throw new IllegalArgumentException("Select statement must " +
-            		"have one field only. "+fields);
+                    "have one field only. "+fields);
     }
 
     /* (non-Javadoc)
@@ -96,7 +96,7 @@
         //System.out.println("Query : " + query);
         if (getQuery() == null)
             throw new QueryHelperException("Please use setQuery(...) " +
-            		"before execute()");
+                    "before execute()");
 
         // Préparation de la requete pour BSH
         if (queryBuilder == null) {
@@ -107,45 +107,44 @@
                 for(int i=0; i<args.size(); i++){
                     inter.set("$" + (i+1), args.get(i));
                 }
-            } catch (EvalError e) {
-                e.printStackTrace();
+            } catch (EvalError eee) {
+                log.log(Level.WARNING, "Error during adding parameters", eee);
             }
             generateMethodsForBSH(inter);
         }
 
         // Filter
-        List result = new ArrayList();
-        for (Iterator it = datas.iterator(); it.hasNext(); ) {
-            Object o = it.next();
-            if (evalTrue(o, queryBuilder.getFilter(), inter))
-                result.add(o);
-        }
-        
-        // FieldPath
-        if (queryBuilder.getFieldName() != null) { 
-            List resultAccordingToFieldPath = new ArrayList(result.size());
-            for (Iterator it = result.iterator(); it.hasNext(); ) {
-	            Object o = eval(it.next(), queryBuilder.getFieldName(), inter);
-	            if (o != null)
-	                resultAccordingToFieldPath.add(o);
-	        }
-	        result = resultAccordingToFieldPath;
+        Collection result = null;
+        if (queryBuilder.isDistinct()) {
+            // pas de doublon lorsque l'on demande distinct
+            result =new LinkedHashSet();
+        } else {
+            result = new ArrayList();
         }
 
-        // Distinct
-        if (queryBuilder.isDistinct()) {
-            List resultAfterDistinct = new ArrayList(result.size());
-            for (Iterator it = result.iterator(); it.hasNext(); ) {
-                Object o = it.next();
-                if (!resultAfterDistinct.contains(o))
-                    resultAfterDistinct.add(o);
+
+        for (Iterator it = datas.iterator(); it.hasNext(); ) {
+            Object o = it.next();
+            // evalTrue est l"equivalent du where
+            if (evalTrue(o, queryBuilder.getFilter(), inter)){
+                // fieldName est l'equivalent du select
+                o = eval(o, queryBuilder.getFieldName(), inter);
+                if(o != null){
+                    result.add(o);
+                }
             }
-            result = resultAfterDistinct;
         }
-        
-        // OrderBy
-        Collections.sort(result, new TopiaCollectionQueryComparator(
+
+        // si on veut le nombre, ca ne sert a rien de trier
+        if(queryBuilder.isCount()){
+            int size = result.size();
+            result.clear();
+            result.add(Integer.valueOf(size));
+        } else {
+            // OrderBy
+            Collections.sort(result, new TopiaCollectionQueryComparator(
                 queryBuilder.getOrderBy(), inter));
+        }
 
         return result;
     }
@@ -176,43 +175,45 @@
                 "else " +
                     "return toObject(o1).compareTo(toObject(o2));" +
             "}");
-        } catch (EvalError e) {
-            e.printStackTrace();
+        } catch (EvalError eee) {
+            log.log(Level.WARNING, "Error during evaluation of method helper", eee);
         }
     }
-    
+
     /**
-     * Applique un filtre sur l'objet spécifié et le renvoie s'il correspond  
+     * Applique un filtre sur l'objet spécifié et le renvoie s'il correspond
      */
     private Object eval(Object object, String field, Interpreter inter) {
-        if (field == null)
-            return object;
-        try {
-            inter.set("target", object);
-            return inter.eval("target." + field); 
-        } catch (EvalError error) {
-            log.info("Error, invalid BSH request : " + error.getMessage());
-            return null;
+        Object result = null;
+        if (field == null){
+            result = object;
+        } else {
+            try {
+                inter.set("target", object);
+                result = inter.eval("target." + field);
+            } catch (EvalError eee) {
+                log.log(Level.WARNING, "Error, invalid BSH request ", eee);
+            }
         }
+        return result;
     }
 
     /**
-     * Evalue le filtre spécifié et renvoie si l'objet correspond (true/false) 
+     * Evalue le filtre spécifié et renvoie si l'objet correspond (true/false)
      */
     protected boolean evalTrue(Object o, String filter, Interpreter inter) {
         //System.out.println("------ Filter : " + filter);
-        Boolean result = new Boolean(false);
+        Boolean result = Boolean.FALSE;
         try {
             inter.set("target", o);
             result = (Boolean)inter.eval(filter);
-        } catch (EvalError e) {
-            log.info("Error, invalid BSH request : " + e.getMessage());
-            return false;
+        } catch (EvalError eee) {
+            log.log(Level.WARNING, "Error, invalid BSH request", eee);
         }
         return result.booleanValue();
     }
-    
-    
+
+
     /**
      * Implémente un comparateur pour le orderBy utilisant un interprêteur BSH
      */
@@ -220,7 +221,7 @@
 
         Map orderBy;
         Interpreter inter;
-        
+
         public TopiaCollectionQueryComparator(Map orderMap, Interpreter inter) {
             if (!(orderMap instanceof LinkedHashMap))
                 log.info("Warning ! Given Map is not a LinkedHashMap : order" +
@@ -228,7 +229,7 @@
             this.orderBy = orderMap;
             this.inter = inter;
         }
-        
+
         /* (non-Javadoc)
          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
          */
@@ -245,8 +246,8 @@
                     inter.set("target1", arg1);
                     Integer i = (Integer)inter.eval(request);
                     compareValue = i.intValue();
-                } catch (EvalError e) {
-                    log.info("Error, invalid BSH request : " + e.getMessage());
+                } catch (EvalError eee) {
+                    log.log(Level.WARNING, "Error, invalid BSH request", eee);
                     compareValue = 0;
                 }
                 if (!asc)
@@ -254,11 +255,11 @@
             }
             return compareValue;
         }
-        
+
     }
-    
+
     public class TopiaCollectionQueryBuilder extends DefaultQueryVisitorUnsupportedOperation {
-        
+
         protected String className;
         protected String fieldName;
         protected String from;
@@ -266,11 +267,12 @@
         //LinkedHashMap instead of Map to keep order between fields
         protected Map orderBy = new LinkedHashMap();
         protected boolean distinct = false;
+        protected boolean count = false;
 
         protected Collection argCollection = new LinkedList();
 
         protected int argCount = 1;
-        
+
         protected Query query;
 
         public String getClassName() {
@@ -295,15 +297,19 @@
             return distinct;
         }
 
-        
+        public boolean isCount(){
+            return count;
+        }
+
+
         public void visitFrom(From from) {
         }
 
         public void visitFromSource(From from, String field, String alias) {
             this.from = field;
         }
-        
-        
+
+
         public void visitOrderBy(OrderBy orderBy) {
         }
         public void visitOrderByField(OrderBy orderBy, FieldPath field,
@@ -314,13 +320,13 @@
                 adaptedField = adaptedField.substring(pos + 1);
             this.orderBy.put(adaptedField, Boolean.valueOf(asc));
         }
-        
-        
+
+
         public void visitQuery(Query query) {
             this.query = query;
         }
-        
-        
+
+
         public void visitSelect(Select select) {
         }
         public void visitSelectAvg(Select select) {
@@ -328,8 +334,7 @@
             System.out.println("\"selectAvg\" " + select);
         }
         public void visitSelectCount(Select select) {
-            // TODO Arno : Auto-generated method stub
-            System.out.println("\"selectCount\" " + select);
+            count = true;
         }
         public void visitSelectDistinct(Select select) {
             distinct = true;
@@ -360,7 +365,7 @@
             // TODO Arno : Auto-generated method stub
             System.out.println("\"selectSum\" " + select);
         }
-        
+
         //Visite récursivement l'opérande spécifiée
         protected void visitOperand(Object op){
             //System.out.println(op.getClass().getName() + " : " + op);
@@ -400,7 +405,7 @@
 
         }
 
-        
+
         public void visitWhere(Where where) {
             //Voir les visitWhere spécifiques...
         }
@@ -440,7 +445,7 @@
             visitOperand(op2);
             filter += "))";
         }
-        
+
         public void visitWhereGreater(Constraint constraint, Object op1,
                 Object op2) {
             filter += "(";
@@ -489,7 +494,7 @@
             visitOperand(op1);
             filter += ")))";
         }
-        
+
         public void visitWhereLike(Constraint constraint, Object op1,
                 Object op2) {
             if(op2 instanceof String) {
@@ -497,7 +502,7 @@
                 int index;
                 while ((index = likeValue.indexOf("%")) != -1)
                     likeValue = likeValue.substring(0, index) + ".*?" +
-                    	likeValue.substring(index + 1);
+                        likeValue.substring(index + 1);
                 op2 = likeValue;
             }
             filter += "(";
@@ -513,7 +518,7 @@
                 int index;
                 while ((index = likeValue.indexOf("%")) != -1)
                     likeValue = likeValue.substring(0, index) + ".*?" +
-                    	likeValue.substring(index + 1);
+                        likeValue.substring(index + 1);
                 op2 = likeValue;
             }
             filter += "(!";