Update of /var/cvs/src/org/mmbase/storage/search/implementation/database
In directory james.mmbase.org:/tmp/cvs-serv13541/implementation/database
Modified Files:
BasicQueryHandler.java BasicSqlHandler.java
InformixSqlHandler.java
Log Message:
MMB-1682. Made getNodes return null as advertised in javadoc
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation/database
See also: http://www.mmbase.org/jira/browse/MMB-1682
Index: BasicQueryHandler.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/database/BasicQueryHandler.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- BasicQueryHandler.java 22 Oct 2007 08:42:40 -0000 1.62
+++ BasicQueryHandler.java 17 Jul 2008 12:55:23 -0000 1.63
@@ -34,7 +34,7 @@
* by the handler, and in this form executed on the database.
*
* @author Rob van Maris
- * @version $Id: BasicQueryHandler.java,v 1.62 2007/10/22 08:42:40 nklasens
Exp $
+ * @version $Id: BasicQueryHandler.java,v 1.63 2008/07/17 12:55:23 michiel Exp
$
* @since MMBase-1.7
*/
public class BasicQueryHandler implements SearchQueryHandler {
@@ -268,8 +268,12 @@
alias = step.getTableName();
}
CoreField field = builder.getField(alias + '.' +
fieldName);
- if (field.getType() == Field.TYPE_BINARY) continue;
+ if (field.getType() == Field.TYPE_BINARY) {
+ log.debug("Binary field " + field.getName() + ",
skipping storeValue");
+ continue;
+ }
Object value = storageManager.getValue(rs, j++, field,
false);
+ log.debug("Got " + value);
node.storeValue(alias + '.' + fieldName, value);
}
node.clearChanged();
Index: BasicSqlHandler.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/database/BasicSqlHandler.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- BasicSqlHandler.java 5 Sep 2007 08:12:13 -0000 1.74
+++ BasicSqlHandler.java 17 Jul 2008 12:55:23 -0000 1.75
@@ -23,7 +23,7 @@
* Basic implementation.
*
* @author Rob van Maris
- * @version $Id: BasicSqlHandler.java,v 1.74 2007/09/05 08:12:13 michiel Exp $
+ * @version $Id: BasicSqlHandler.java,v 1.75 2008/07/17 12:55:23 michiel Exp $
* @since MMBase-1.7
*/
@@ -467,7 +467,7 @@
// Included nodes.
SortedSet<Integer> nodes = step.getNodes();
- if (nodes.size() > 0) {
+ if (nodes != null) {
if (sbNodes.length() > 0) {
sbNodes.append(" AND ");
}
Index: InformixSqlHandler.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/database/InformixSqlHandler.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- InformixSqlHandler.java 18 Sep 2007 11:40:42 -0000 1.35
+++ InformixSqlHandler.java 17 Jul 2008 12:55:23 -0000 1.36
@@ -39,7 +39,7 @@
* </ul>
*
* @author Rob van Maris
- * @version $Id: InformixSqlHandler.java,v 1.35 2007/09/18 11:40:42 michiel
Exp $
+ * @version $Id: InformixSqlHandler.java,v 1.36 2008/07/17 12:55:23 michiel
Exp $
* @since MMBase-1.7
*/
public class InformixSqlHandler extends BasicSqlHandler implements SqlHandler {
@@ -296,7 +296,7 @@
// Included nodes.
SortedSet<Integer> nodes = step.getNodes();
- if (nodes.size() > 0) {
+ if (nodes != null) {
if (sbNodes.length() > 0) {
sbNodes.append(" AND ");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
