Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv14453
Modified Files:
Tag: MMBase-1_8
LocalizedEntryListFactory.java
Log Message:
MMB-1707
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
See also: http://www.mmbase.org/jira/browse/MMB-1707
Index: LocalizedEntryListFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/LocalizedEntryListFactory.java,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -b -r1.39.2.2 -r1.39.2.3
--- LocalizedEntryListFactory.java 23 May 2007 13:26:28 -0000 1.39.2.2
+++ LocalizedEntryListFactory.java 18 Aug 2008 11:02:52 -0000 1.39.2.3
@@ -12,6 +12,7 @@
import java.util.*;
import java.io.*;
import org.w3c.dom.*;
+import org.mmbase.storage.search.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.xml.query.*;
@@ -37,7 +38,7 @@
* partially by explicit values, though this is not recommended.
*
* @author Michiel Meeuwissen
- * @version $Id: LocalizedEntryListFactory.java,v 1.39.2.2 2007/05/23 13:26:28
michiel Exp $
+ * @version $Id: LocalizedEntryListFactory.java,v 1.39.2.3 2008/08/18 11:02:52
michiel Exp $
* @since MMBase-1.8
*/
public class LocalizedEntryListFactory implements Serializable, Cloneable {
@@ -312,7 +313,7 @@
continue;
}
}
- Query query =
QueryReader.parseQuery(element, useCloud, null).query;
+ final Query query =
QueryReader.parseQuery(element, useCloud, null).query;
final org.mmbase.bridge.NodeList list =
query.getList();
subIterator = new Iterator() {
final NodeIterator nodeIterator =
list.nodeIterator();
@@ -321,7 +322,20 @@
}
public Object next() {
org.mmbase.bridge.Node next =
nodeIterator.nextNode();
+ if (query instanceof
NodeQuery) {
return new Entry(next,
next.getFunctionValue("gui", null));
+ } else {
+ String alias =
Queries.getFieldAlias((StepField) query.getFields().get(0));
+ log.debug("using field " +
alias);
+ if
(query.getFields().size() == 1) {
+ return new
Entry(next.getValue(alias),
+
next.getStringValue(alias));
+ } else {
+ String alias2 =
Queries.getFieldAlias((StepField) query.getFields().get(1));
+ return new
Entry(next.getValue(alias),
+
next.getStringValue(alias2));
+ }
+ }
}
public void remove() {
throw new
UnsupportedOperationException();
@@ -425,7 +439,7 @@
try {
queriesSize +=
Queries.count(QueryReader.parseQuery(element, cloud, null).query);
} catch (Exception e) {
- log.warn(e);
+ log.warn(e.getMessage(), e);
}
} else {
queriesSize++;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
