- producer links are moved to an "advanced" page, not intended for normal

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

diff --git a/source/mir/producer/EntityEnumeratingProducerNode.java b/source/mir/producer/EntityEnumeratingProducerNode.java
index e9d3f5d..4b16de6 100755 (executable)
--- a/source/mir/producer/EntityEnumeratingProducerNode.java
+++ b/source/mir/producer/EntityEnumeratingProducerNode.java
@@ -39,69 +39,48 @@ import mir.storage.*;
 import mir.util.*;
 
 public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
-  private Map verbs;
-  private EntityEnumeratingProducerNodeVerb defaultVerb;
   private String key;
   private EntityAdapterModel model;
   private String definition;
   private String skip;
   private String limit;
+  private String whereClause;
+  private String orderByClause;
+
 
   public EntityEnumeratingProducerNode(
-                String aKey,
-                EntityAdapterModel aModel, String aDefinition,
-                ProducerNode aSubNode) {
+              String aKey,
+              EntityAdapterModel aModel, String aDefinition,
+              String aWhereClause, String anOrderByClause,
+              String aLimit, String aSkip,
+              ProducerNode aSubNode) {
     super(aSubNode);
 
-    defaultVerb = null;
-    verbs = new HashMap();
     model = aModel;
     definition = aDefinition;
     key = aKey;
-  }
 
-  public EntityEnumeratingProducerNode(
-              String aKey,
-              EntityAdapterModel aModel, String aDefinition,
-              String aDefaultWhereClause, String aDefaultOrderByClause,
-              ProducerNode aSubNode) {
-    this(aKey, aModel, aDefinition, aDefaultWhereClause, aDefaultOrderByClause, "", "", aSubNode);
-  }
-
-  public EntityEnumeratingProducerNode(
-              String aKey,
-              EntityAdapterModel aModel, String aDefinition,
-              String aDefaultWhereClause, String aDefaultOrderByClause,
-              String aLimit, String aSkip,
-              ProducerNode aSubNode) {
-    this(aKey, aModel, aDefinition, aSubNode);
+    whereClause = aWhereClause;
+    orderByClause = anOrderByClause;
 
     limit= aLimit;
     skip = aSkip;
-    defaultVerb = new EntityEnumeratingProducerNodeVerb(aDefaultWhereClause, aDefaultOrderByClause);
   }
 
   public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
-    EntityEnumeratingProducerNodeVerb verb = (EntityEnumeratingProducerNodeVerb) verbs.get(aVerb);
     Iterator browser;
 
-    if (verb==null)
-      verb = defaultVerb;
-
-    if (verb==null)
-      throw new ProducerFailure("EntityEnumeratingProducerNode: unknown verb '"+aVerb+"'", null);
-
     try {
       browser = new EntityIteratorAdapter(
-          ParameterExpander.expandExpression( aValueMap, verb.whereClause ),
-          ParameterExpander.expandExpression( aValueMap, verb.orderByClause ),
+          ParameterExpander.expandExpression( aValueMap, whereClause ),
+          ParameterExpander.expandExpression( aValueMap, orderByClause ),
           100,
           model,
           definition,
           ParameterExpander.evaluateIntegerExpressionWithDefault( aValueMap, limit, -1),
           ParameterExpander.evaluateIntegerExpressionWithDefault( aValueMap, skip, 0));
 
-      while (browser.hasNext()) {
+      while (browser.hasNext() && !isAborted(aValueMap)) {
         ParameterExpander.setValueForKey( aValueMap, key, browser.next());
         super.produce(aValueMap, aVerb, aLogger);
       }
@@ -110,27 +89,4 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
       throw new ProducerFailure(t.getMessage(), t);
     }
   };
-
-  public Set buildVerbSet() {
-    Set set;
-
-    set = super.buildVerbSet();
-    set.addAll(verbs.keySet());
-
-    return set;
-  };
-
-  public void addVerb(String aVerb, String aWhereClause, String anOrderByClause) {
-    verbs.put(aVerb, new EntityEnumeratingProducerNodeVerb(aWhereClause, anOrderByClause));
-  }
-
-  private class EntityEnumeratingProducerNodeVerb {
-    String whereClause;
-    String orderByClause;
-
-    EntityEnumeratingProducerNodeVerb(String aWhereClause, String anOrderByClause) {
-      whereClause = aWhereClause;
-      orderByClause = anOrderByClause;
-    }
-  }
 }
\ No newline at end of file