# HG changeset patch
# User Frederic Bastien <bastienf@iro.umontreal.ca>
# Date 1210615999 14400
# Node ID 488ad6398b12324d04b6420b4d4af5d82873edaf
# Parent  0c6fec172ae1f5f9d3f649ddba54293ca9ade25d
bugfix

diff -r 0c6fec172ae1 -r 488ad6398b12 dataset.py
--- a/dataset.py	Mon May 12 14:11:57 2008 -0400
+++ b/dataset.py	Mon May 12 14:13:19 2008 -0400
@@ -765,12 +765,16 @@
                 return self
             def next(self):
                 # concatenate all the fields of the minibatches
+                l=LookupList()
+                for iter in self.iterators:
+                    l.append_lookuplist(iter.next())
+                return l
                 return reduce(LookupList.__add__,[iterator.next() for iterator in self.iterators])
                                      
         assert self.hasFields(*fieldnames)
         # find out which underlying datasets are necessary to service the required fields
         # and construct corresponding minibatch iterators
-        if fieldnames:
+        if fieldnames and fieldnames!=self.fieldNames():
             datasets=set([])
             fields_in_dataset=dict([(dataset,[]) for dataset in datasets])
             for fieldname in fieldnames: