1.1 restoration

[mir.git] / source / mir / producer / EntityEnumeratingProducerNode.java

diff --git a/source/mir/producer/EntityEnumeratingProducerNode.java b/source/mir/producer/EntityEnumeratingProducerNode.java
index da7bd9e..ca4fef8 100755 (executable)
--- a/source/mir/producer/EntityEnumeratingProducerNode.java
+++ b/source/mir/producer/EntityEnumeratingProducerNode.java
@@ -18,32 +18,32 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.producer;
 
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import mir.entity.adapter.EntityAdapterModel;
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
 import mir.util.ParameterExpander;
+import mir.util.StringRoutines;
 
 public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
   private String key;
   private EntityAdapterModel model;
   private String definition;
   private String mainTablePrefix;
-  private List extraTables;
+  private String extraTables;
   private String skip;
   private String limit;
   private String whereClause;
@@ -52,7 +52,7 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
   public EntityEnumeratingProducerNode(
               String aKey,
               EntityAdapterModel aModel, String aMainTablePrefix,
-              List someExtraTables, String aDefinition,
+              String anExtraTables, String aDefinition,
               String aWhereClause, String anOrderByClause,
               String aLimit, String aSkip,
               ProducerNode aSubNode) {
@@ -62,7 +62,7 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
     definition = aDefinition;
     key = aKey;
     mainTablePrefix=aMainTablePrefix;
-    extraTables=someExtraTables;
+    extraTables = anExtraTables;
     whereClause = aWhereClause;
     orderByClause = anOrderByClause;
 
@@ -76,7 +76,7 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
     try {
       browser = new EntityIteratorAdapter(
           mainTablePrefix,
-          extraTables,
+          StringRoutines.splitString(ParameterExpander.expandExpression( aValueMap, extraTables).trim(), ","),
           ParameterExpander.expandExpression( aValueMap, whereClause ),
           ParameterExpander.expandExpression( aValueMap, orderByClause ),
           100,