Update of /var/cvs/src/org/mmbase/bridge/util/xml/query
In directory james.mmbase.org:/tmp/cvs-serv14609/query
Modified Files:
QueryReader.java
Log Message:
to fix MMB-1707, made it possible to explicitley make a query multilevel
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util/xml/query
See also: http://www.mmbase.org/jira/browse/MMB-1707
Index: QueryReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/xml/query/QueryReader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- QueryReader.java 13 Aug 2008 08:12:22 -0000 1.17
+++ QueryReader.java 18 Aug 2008 11:07:21 -0000 1.18
@@ -23,7 +23,7 @@
* This class contains static methods related to creating a Query object using
a (fragment of an) XML.
*
* @author Pierre van Rooden
- * @version $Id: QueryReader.java,v 1.17 2008/08/13 08:12:22 michiel Exp $
+ * @version $Id: QueryReader.java,v 1.18 2008/08/18 11:07:21 michiel Exp $
* @since MMBase-1.8
**/
public abstract class QueryReader {
@@ -55,8 +55,8 @@
* searchquery namespace
*/
static public String getAttribute(Element element, String localName) {
- if (element.hasAttributeNS(NAMESPACE_SEARCHQUERY,localName)) {
- return element.getAttributeNS(NAMESPACE_SEARCHQUERY,localName);
+ if (element.hasAttributeNS(NAMESPACE_SEARCHQUERY, localName)) {
+ return element.getAttributeNS(NAMESPACE_SEARCHQUERY, localName);
} else {
return element.getAttribute(localName);
}
@@ -418,7 +418,7 @@
QueryDefinition queryDefinition = configurer.getQueryDefinition();
queryDefinition.isMultiLevel = !path.equals(element);
- if (element != null) {
+ if (element != null && ! "".equals(element)) {
queryDefinition.elementManager =
cloud.getNodeManager(Queries.removeDigits(element));
}
if (queryDefinition.isMultiLevel) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
