Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv13302
Modified Files:
Tag: MMBase-1_8
Queries.java
Log Message:
the check ofn fieldname euqlas number made no sense
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: Queries.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/Queries.java,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -b -r1.77.2.9 -r1.77.2.10
--- Queries.java 14 Apr 2008 15:27:48 -0000 1.77.2.9
+++ Queries.java 18 Aug 2008 09:50:04 -0000 1.77.2.10
@@ -29,7 +29,7 @@
* methods are put here.
*
* @author Michiel Meeuwissen
- * @version $Id: Queries.java,v 1.77.2.9 2008/04/14 15:27:48 michiel Exp $
+ * @version $Id: Queries.java,v 1.77.2.10 2008/08/18 09:50:04 michiel Exp $
* @see org.mmbase.bridge.Query
* @since MMBase-1.7
*/
@@ -935,10 +935,10 @@
step = sf.getStep();
} else {
if (! step.equals(sf.getStep())) {
- throw new UnsupportedOperationException("Cannot
count distinct queries with fields of more than one step. Current fields: " +
fields);
+ throw new UnsupportedOperationException("Cannot
count distinct queries with fields of more than one step. Current fields: " +
fields + " " + step + " != " + sf.getStep());
}
}
- if (sf.getFieldName().equals("number")) {
+ if (resultName == null) {
resultName = sf.getFieldName();
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
