cleanup / abuse system fix / prepping for a release

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

diff --git a/source/mir/producer/RDFAggregatorProducerNode.java b/source/mir/producer/RDFAggregatorProducerNode.java
index 02ce159..14377e9 100755 (executable)
--- a/source/mir/producer/RDFAggregatorProducerNode.java
+++ b/source/mir/producer/RDFAggregatorProducerNode.java
@@ -34,27 +34,22 @@ import java.util.Map;
 
 import mir.log.LoggerWrapper;
 import mir.rss.RSSAggregator;
-import mir.util.ExceptionFunctions;
+import mir.util.ExceptionRoutines;
 import mir.util.ParameterExpander;
 
-public class RDFAggregatorProducerNode implements ProducerNode {
+public class RDFAggregatorProducerNode extends AbstractProducerNode {
   private String key;
   private String source;
-  private String order;
-  private String filter;
 
-  public RDFAggregatorProducerNode(String aKey, String aSource, String anOrder, String aFilter) {
+  public RDFAggregatorProducerNode(String aKey, String aSource) {
     key = aKey;
     source=aSource;
-    order=anOrder;
-    filter=aFilter;
   }
 
   public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
     try {
       aLogger.debug(source);
       String evaluatedKey = ParameterExpander.expandExpression( aValueMap, key );
-      String evaluatedOrder = ParameterExpander.expandExpression( aValueMap, order );
       Object evaluatedSource = ParameterExpander.evaluateExpression( aValueMap, source );
 
       Object aggregator = aValueMap.get(evaluatedKey);
@@ -80,7 +75,7 @@ public class RDFAggregatorProducerNode implements ProducerNode {
         throw new ProducerExc("RSSAggregator expected, " + aggregator.toString() + " found");
     }
     catch (Throwable t) {
-      Throwable s = ExceptionFunctions.traceCauseException(t);
+      Throwable s = ExceptionRoutines.traceCauseException(t);
       aLogger.error("Error while aggregating RDF data: " + s.getClass().getName()+","+ s.getMessage());
     }
   }