[MMBASE CVS] src/org/mmbase/datatypes NodeDataType.java UniqueStringDataType.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv7217

Modified Files:
      Tag: MMBase-1_8
        NodeDataType.java UniqueStringDataType.java 
Log Message:
added debug only


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes


Index: NodeDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/NodeDataType.java,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -b -r1.30 -r1.30.2.1
--- NodeDataType.java   17 Jul 2006 07:32:29 -0000      1.30
+++ NodeDataType.java   10 Jun 2008 11:08:45 -0000      1.30.2.1
@@ -20,7 +20,7 @@
  *
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: NodeDataType.java,v 1.30 2006/07/17 07:32:29 pierre Exp $
+ * @version $Id: NodeDataType.java,v 1.30.2.1 2008/06/10 11:08:45 michiel Exp $
  * @since MMBase-1.8
  */
 public class NodeDataType extends BasicDataType {
@@ -54,9 +54,14 @@
     protected Object castToValidate(Object value, Node node, Field field) 
throws CastException {
         if (value == null) return null;
         Object preCast = preCast(value, node, field); // resolves enumerations
+        if (log.isDebugEnabled()) {
+        log.debug("CAsting to validate " + preCast);
+        }
         if (preCast instanceof Node) {
+            log.debug("A Node already");
             return preCast;
         }  else {
+            log.debug("A calling toType");
             Object res = Casting.toType(Node.class, getCloud(node, field), 
preCast);
             if (res == null) {
                 if (Casting.toString(value).equals("-1")) {
@@ -64,6 +69,9 @@
                 }
                 throw new CastException("No such node " + preCast);
             } else {
+                if (log.isDebugEnabled()) {
+                    log.debug("Found " + res);
+                }
                 return res;
             }
         }


Index: UniqueStringDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/UniqueStringDataType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- UniqueStringDataType.java   9 Jun 2008 10:18:40 -0000       1.1.2.1
+++ UniqueStringDataType.java   10 Jun 2008 11:08:45 -0000      1.1.2.2
@@ -22,7 +22,7 @@
  * namely, ensuring that it is unique already.
  *
  * @author Michiel Meeuwissen
- * @version $Id: UniqueStringDataType.java,v 1.1.2.1 2008/06/09 10:18:40 
michiel Exp $
+ * @version $Id: UniqueStringDataType.java,v 1.1.2.2 2008/06/10 11:08:45 
michiel Exp $
  * @since MMBase-1.8.6
  */
 public class UniqueStringDataType extends StringDataType {
@@ -36,22 +36,33 @@
 
     public Object getDefaultValue(Locale locale, Cloud cloud, Field field) {
         if (defaultValue == null) return null;
-        if (field == null) return defaultValue;
+        if (field == null) {
+            log.debug("No field provided, returing plain default value.");
+            return defaultValue;
+        }
         try {
             int seq = 0;
             Object value = defaultValue;
             while (true) {
                 NodeQuery q = field.getNodeManager().createQuery();
+                log.debug("No field provided, returing plain default value.");
                 value = "" + defaultValue + seq;
                 Constraint constraint = 
q.createConstraint(q.createStepField(field.getName()), value);
                 q.setConstraint(constraint);
+                if (log.isDebugEnabled()) {
+                    log.debug("Counting " + q.toSql());
+                }
                 if (Queries.count(q) == 0) {
+                    log.debug("" + value + " is unique");
                     break;
+                } else {
+                    log.debug("" + value + " is not unique");
             }
                 seq++;
             }
             return value;
         } catch (UnsupportedOperationException uoe) {
+            log.debug(uoe);
             return null;
         }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs