X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fproducer%2FEntityListProducerNode.java;fp=source%2Fmir%2Fproducer%2FEntityListProducerNode.java;h=32e0d3a8976f0aaf5da37e6b9e708c2c25c2a9e9;hb=2b0e1c1d91eea7e201af61e1065ad12bf966d1ba;hp=123c15b602b36188811316088731a855d14a5c83;hpb=44425d18d2bb421e09e4add11c20f2c8d2129d26;p=mir.git

diff --git a/source/mir/producer/EntityListProducerNode.java b/source/mir/producer/EntityListProducerNode.java
index 123c15b6..32e0d3a8 100755
--- a/source/mir/producer/EntityListProducerNode.java
+++ b/source/mir/producer/EntityListProducerNode.java
@@ -18,59 +18,55 @@
  * 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.Collections;
 import java.util.Map;
-import java.util.Vector;
 
 import mir.entity.adapter.EntityAdapterModel;
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
 import mir.util.CachingRewindableIterator;
 import mir.util.ParameterExpander;
+import mir.util.StringRoutines;
 
 public class EntityListProducerNode extends ProducerNodeDecorator {
-  private String key;
+  private String keyExpression;
   private String whereClause;
   private String orderByClause;
-  private int batchSize;
+  private String mainTablePrefix;
+  private String extraTables;
   private EntityAdapterModel model;
   private String definition;
   private String limitExpression;
   private String skipExpression;
 
   public EntityListProducerNode(String aKey,
-      EntityAdapterModel aModel, String aDefinition,
-      String aWhereClause, String anOrderByClause,
+      EntityAdapterModel aModel, String aMainTablePrefix, String anExtraTables,
+      String aDefinition, String aWhereClause, String anOrderByClause,
       String aLimitExpression, String aSkipExpression, ProducerNode aSubNode) {
     super(aSubNode);
 
     model = aModel;
+    mainTablePrefix = aMainTablePrefix;
+    extraTables = anExtraTables;
     definition = aDefinition;
-    key = aKey;
+    keyExpression = aKey;
     whereClause = aWhereClause;
     orderByClause = anOrderByClause;
     limitExpression = aLimitExpression;
     skipExpression = aSkipExpression;
   }
 
-  public EntityListProducerNode(String aKey,
-      EntityAdapterModel aModel, String aDefinition,
-      String aWhereClause, String anOrderByClause,
-      int aLimit, int aSkip, ProducerNode aSubNode) {
-    this(aKey,  aModel, aDefinition, aWhereClause, anOrderByClause,
-         Integer.toString(aLimit), Integer.toString(aSkip), aSubNode);
-  }
-
   public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure, ProducerExc {
     try {
       int limit = ParameterExpander.evaluateIntegerExpressionWithDefault(aValueMap, limitExpression, -1);
@@ -78,36 +74,42 @@ public class EntityListProducerNode extends ProducerNodeDecorator {
 
       if (skipExpression != null && !skipExpression.trim().equals(""))
         skip = ParameterExpander.evaluateIntegerExpression(aValueMap, skipExpression);
+      String key = ParameterExpander.expandExpression(aValueMap, keyExpression);
 
-      ParameterExpander.setValueForKey(
-        aValueMap,
-        key,
-        new CachingRewindableIterator(
-          new EntityIteratorAdapter(
-            ParameterExpander.expandExpression( aValueMap, whereClause ),
-            ParameterExpander.expandExpression( aValueMap, orderByClause ),
-            Math.min(50, limit),
-            model,
-            definition,
-            limit,
-            skip )
-        )
-      );
-    }
-    catch (Throwable t) {
-      aLogger.error("cannot retrieve list into key " + key + ": " + t.getMessage());
       try {
         ParameterExpander.setValueForKey(
           aValueMap,
           key,
-          new CachingRewindableIterator(new Vector().iterator())
+          new CachingRewindableIterator(
+            new EntityIteratorAdapter( mainTablePrefix,
+              StringRoutines.splitString(ParameterExpander.expandExpression( aValueMap, extraTables).trim(), ","),
+              ParameterExpander.expandExpression( aValueMap, whereClause ),
+              ParameterExpander.expandExpression( aValueMap, orderByClause ),
+              Math.min(50, limit),
+              model,
+              definition,
+              limit,
+              skip )
+          )
         );
       }
-      catch (Throwable s) {
+      catch (Throwable t) {
+        aLogger.error("cannot retrieve list into keyExpression " + key + ": " + t.getMessage());
+        try {
+          ParameterExpander.setValueForKey(
+            aValueMap,
+            key,
+            new CachingRewindableIterator(Collections.EMPTY_LIST.iterator())
+          );
+        }
+        catch (Throwable s) {
+        }
       }
     }
+    catch (Throwable t) {
+      aLogger.error("cannot process entity list producer node: : " + t.getMessage());
+    }
 
     super.produce(aValueMap, aVerb, aLogger);
-  };
-
+  }
 }
\ No newline at end of file