perfsonar development work

Author: michael.bischoff
Date: 2007-10-25 04:56:18 -0400 (Thu, 25 Oct 2007)
New Revision: 2993

Added:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/Field.java
Modified:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaGetRequest.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/RawFlowsResponse.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/Exporter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Filter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
Log:
correct file selection
fix: filter raw data query.

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
        2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
        2007-10-25 08:56:18 UTC (rev 2993)
@@ -19,20 +19,16 @@
    </handler>
   </requestFlow>
  </globalConfiguration>
- <handler name="soapmonitor" 
type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>
+ <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="LocalResponder" 
type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="Authenticate" 
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <handler name="soapmonitor" 
type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>
  <service name="AdminService" provider="java:MSG">
   <parameter name="allowedMethods" value="AdminService"/>
   <parameter name="enableRemoteAdmin" value="false"/>
   <parameter name="className" value="org.apache.axis.utils.Admin"/>
   <namespace>http://xml.apache.org/axis/wsdd/</namespace>
  </service>
- <service name="Version" provider="java:RPC">
-  <parameter name="allowedMethods" value="getVersion"/>
-  <parameter name="className" value="org.apache.axis.Version"/>
- </service>
  <service name="FlowsaMeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
   <requestFlow>
    <handler name="soapmonitor" 
type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>
@@ -46,6 +42,10 @@
                        http://perfsonar.org/services/measurementArchive
                </namespace>
  </service>
+ <service name="Version" provider="java:RPC">
+  <parameter name="allowedMethods" value="getVersion"/>
+  <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
  <transport name="http">
   <requestFlow>
    <handler type="URLMapper"/>

Added: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/Field.java

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaGetRequest.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaGetRequest.java
     2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaGetRequest.java
     2007-10-25 08:56:18 UTC (rev 2993)
@@ -6,8 +6,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
 import org.ggf.ns.nmwg.base.v2_0.Message;
@@ -72,8 +74,8 @@
                        return;
                }
                for (Parameter parameter : parameters.getParameterArray()) {
-                       String name = parameter.getParameterName();
-                       if ("startTime".equals(name) || 
"endTime".equals(name)) {
+                       String name = 
parameter.getParameterName().toLowerCase();
+                       if ("starttime".equals(name) || 
"endtime".equals(name)) {
                                processTimeParameter(parameter);
                        } else {
                                this.parameters.put(name, 
parameter.getParameterValue());
@@ -85,7 +87,7 @@
                for (Element child : parameter.getChildArray()) {
                        if (child instanceof Time) {
                                Time time = (Time) child;
-                               parameters.put(parameter.getParameterName(), 
time.getValue());
+                               
parameters.put(parameter.getParameterName().toLowerCase(), time.getValue());
                        }
                }
        }
@@ -95,9 +97,7 @@
                        return;
                }
                this.eventTypeValue = eventType.getEventType();
-               logger
-                               
.debug("FlowsaMAServiceEngine.processGetDataRequest: Eventype indentified as: 
"
-                                               + eventTypeValue);
+               logger.debug("FlowsaMAServiceEngine.processGetDataRequest: 
Eventype indentified as: " + eventTypeValue);
                this.eventType = EventType.get(eventTypeValue);
        }
 
@@ -134,11 +134,9 @@
         * @return
         * @throws PerfSONARException
         */
-       private static LoggerComponent getLoggerComponent()
-                       throws PerfSONARException {
+       private static LoggerComponent getLoggerComponent()     throws 
PerfSONARException {
                try {
-                       return (LoggerComponent) 
AuxiliaryComponentManager.getInstance()
-                                       .getComponent(ComponentNames.LOGGER);
+                       return (LoggerComponent) 
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
                } catch (PerfSONARException underlayingException) {
                        throw new PerfSONARException(
                                        "error.common.no_logger",
@@ -153,7 +151,11 @@
         */
        public Date getStartTime() {
                if (startTime == null) {
-                       String value = parameters.get("startTime");
+                       String value = parameters.get("starttime");
+                       if(value==null) {
+                           logger.error("no startTime specified.");
+                           return startTime;
+                       }
                        DateFormat dateFormat = new 
SimpleDateFormat(ISO8601_PATTERN);
                        try {
                                startTime = dateFormat.parse(value);
@@ -167,7 +169,11 @@
 
        public Date getEndTime() {
                if (endTime == null) {
-                       String value = parameters.get("endTime");
+                       String value = parameters.get("endtime");
+                if(value==null) {
+                    logger.error("no endTime specified.");
+                    return endTime;
+                }
                        DateFormat dateFormat = new 
SimpleDateFormat(ISO8601_PATTERN);
                        try {
                                endTime = dateFormat.parse(value);
@@ -180,7 +186,7 @@
        }
 
        public Filter getFilter() {
-               String value = parameters.get("filterRule");
+               String value = parameters.get("filterrule");
                if (value == null || value.equals("")) {
                        return null;
                }
@@ -188,7 +194,7 @@
        }
 
        public AggegrationRule getAggegrationRule() {
-               String value = parameters.get("aggregationRule");
+               String value = parameters.get("aggregationrule");
                if (value == null || value.equals("")) {
                        return null;
                }
@@ -211,21 +217,21 @@
        }
 
        public String getTopStatistic() {
-               return parameters.get("topStatistic");
+               return parameters.get("topstatistic");
        }
 
        public String getOrderBy() {
-               return parameters.get("orderBy");
+               return parameters.get("orderby");
        }
 
        public boolean isSplittingProtocol() {
-               return parameters.get("splitProtocol").equals("yes");
+               return parameters.get("splitprotocol").equals("yes");
        }
 
        public int getTopN() {
                if (topN == null) {
                        try {
-                               topN = new Integer(parameters.get("topN"));
+                               topN = new Integer(parameters.get("topn"));
                        } catch (NumberFormatException e) {
                                logger.error("topN could not be parsed");
                                topN = Integer.valueOf(10);
@@ -233,4 +239,63 @@
                }
                return topN.intValue();
        }
+
+    public Set<Field> getFieldsToShow() {
+        Set<Field> set = EnumSet.noneOf(Field.class);
+        if(parameters.containsKey("showfieldaddressfamily")) {
+            set.add(Field.ADDRESS_FAMILY);
+        } 
+        if(parameters.containsKey("showfieldbytes")) {
+            set.add(Field.BYTES);
+        } 
+        if(parameters.containsKey("showfielddstaddress")) {
+            set.add(Field.DESTINATION_ADDRESS);
+        } 
+        if(parameters.containsKey("showfielddstas")) {
+            set.add(Field.DESTINATION_AS_NUMBER);
+        } 
+        if(parameters.containsKey("showfielddstport")) {
+            set.add(Field.DESTINATION_PORT);
+        } 
+        if(parameters.containsKey("showfieldinputif")) {
+            set.add(Field.INPUT_INTERFACE);
+        } 
+        if(parameters.containsKey("showfieldmsecfirstseen")) {
+            set.add(Field.MSEC_FIRST_SEEN);
+        } 
+        if(parameters.containsKey("showfieldmseclastseen")) {
+            set.add(Field.MSEC_LAST_SEEN);
+        } 
+        if(parameters.containsKey("showfieldoutputif")) {
+            set.add(Field.OUTPUT_INTERFACE);
+        } 
+        if(parameters.containsKey("showfieldpackets")) {
+            set.add(Field.PACKETS);
+        } 
+        if(parameters.containsKey("showfieldprotocol")) {
+            set.add(Field.PROTOCOL);
+        } 
+        if(parameters.containsKey("showfieldsrcaddress")) {
+            set.add(Field.SOURCE_ADDRESS);
+        } 
+        if(parameters.containsKey("showfieldsrcas")) {
+            set.add(Field.SOURCE_AS_NUMBER);
+        } 
+        if(parameters.containsKey("showfieldsrcport")) {
+            set.add(Field.SOURCE_PORT);
+        } 
+        if(parameters.containsKey("showfieldtimefirstseen")) {
+            set.add(Field.TIME_FIRST_SEEN);
+        } 
+        if(parameters.containsKey("showfieldtimelastseen")) {
+            set.add(Field.TIME_LAST_SEEN);
+        } 
+        if(parameters.containsKey("showfieldtos")) {
+            set.add(Field.TYPE_OF_SERVICE);
+        }
+        if(parameters.containsKey("tcpflags")) {
+            set.add(Field.TCP_FLAGS);
+        }
+        return set;
+    }
 }

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
        2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
        2007-10-25 08:56:18 UTC (rev 2993)
@@ -190,7 +190,7 @@
         logger.debug("FlowsaMAServiceEngine.handleRawFlowRequest: Executing 
query.");
         List<Flow> result = nfdump.execute(query);
         logger.debug("FlowsaMAServiceEngine.handleRawFlowRequest: Creating 
response.");
-        return new RawFlowsResponse(request.getMetadata(), result);
+        return new RawFlowsResponse(request.getMetadata(), result, 
request.getFieldsToShow());
     }
     /**
      * handles a Statistics request. creates a query from 

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
    2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
    2007-10-25 08:56:18 UTC (rev 2993)
@@ -11,8 +11,8 @@
 /**
  * This class handles base chaining of NMWG Interface element for MA requests
  * 
- * IMPORTANT: this class is not merging it simply discards the other data, 
please implement 
- * correctly when we actually need the functionally profided by this class.
+ * FIXME TODO IMPORTANT: this class is not merging it simply discards the 
other data, please implement 
+ * correctly when we actually need the functionally provided by this class.
  * 
  * @author romradz, Michael bischoff 
  * @version $Id$

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/RawFlowsResponse.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/RawFlowsResponse.java
     2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/RawFlowsResponse.java
     2007-10-25 08:56:18 UTC (rev 2993)
@@ -1,7 +1,27 @@
 package org.perfsonar.service.measurementArchive.flowsa;
 
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.ADDRESS_FAMILY;
+import static org.perfsonar.service.measurementArchive.flowsa.Field.BYTES;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.DESTINATION_ADDRESS;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.DESTINATION_AS_NUMBER;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.DESTINATION_PORT;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.INPUT_INTERFACE;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.MSEC_FIRST_SEEN;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.MSEC_LAST_SEEN;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.OUTPUT_INTERFACE;
+import static org.perfsonar.service.measurementArchive.flowsa.Field.PACKETS;
+import static org.perfsonar.service.measurementArchive.flowsa.Field.PROTOCOL;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.SOURCE_ADDRESS;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.SOURCE_AS_NUMBER;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.SOURCE_PORT;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.TIME_FIRST_SEEN;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.TIME_LAST_SEEN;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.TYPE_OF_SERVICE;
+import static 
org.perfsonar.service.measurementArchive.flowsa.Field.TCP_FLAGS;
+
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
@@ -10,41 +30,42 @@
 
 public class RawFlowsResponse extends FlowsaGetResponse {
 
-    public RawFlowsResponse(Metadata[] metadatas, List<Flow> flows) {
+    public RawFlowsResponse(Metadata[] metadatas, List<Flow> flows, 
Set<Field> showFields) {
        super(metadatas);
-        setData(convertToData(flows));
+        setData(convertToData(flows, showFields));
     }
 
-       private Data convertToData(List<Flow> flows) {
+       private Data convertToData(List<Flow> flows, Set<Field> showFields) {
                Data data = new Data();
                data.setId("data1");
                Iterator<Flow> iterator = flows.iterator();
                while(iterator.hasNext()) {
-                       data.addChild(convertToDatum(iterator.next()));
+                       data.addChild(convertToDatum(iterator.next(), 
showFields));
                        iterator.remove(); // free up resources.
                }
                return data;
        }
 
-       private Datum convertToDatum(Flow flow) {
-               Datum datum = new Datum();                              
-               datum.setAdressFamily(flow.getAdressFamily());
-               datum.setBytes(flow.getBytes());
-               datum.setDestinationAdress(flow.getDestinationAdress());
-               datum.setDestinationAsNumber(flow.getDestinationAsNumber());
-               datum.setDestinationPort(flow.getDestinationPort());
-               datum.setInputInterface(flow.getInputInterface());
-               datum.setMsecFirstSeen(flow.getMsecFirstSeen());
-               datum.setMsecFirstSeen(flow.getMsecLastSeen());
-               datum.setOutputInterface(flow.getOutputInterface());
-               datum.setPackets(flow.getPackets());
-               datum.setProtocol(flow.getProtocol());
-               datum.setSourceAddress(flow.getSourceAddress());
-               datum.setSourceAsNumber(flow.getSourceAsNumber());
-               datum.setSourcePort(flow.getSourcePort());
-               datum.setTimeFirstSeen(flow.getTimeFirstSeen());
-               datum.setTimeLastSeen(flow.getTimeLastSeen());
-               datum.setTypeOfService(flow.getTypeOfService());
+       private Datum convertToDatum(Flow flow, Set<Field> showFields) {
+               Datum datum = new Datum();
+               if(showFields.contains(ADDRESS_FAMILY)) 
datum.setAdressFamily(flow.getAdressFamily());
+               if(showFields.contains(BYTES)) 
datum.setBytes(flow.getBytes());
+               if(showFields.contains(DESTINATION_ADDRESS)) 
datum.setDestinationAdress(flow.getDestinationAdress());
+               if(showFields.contains(DESTINATION_AS_NUMBER)) 
datum.setDestinationAsNumber(flow.getDestinationAsNumber());
+               if(showFields.contains(DESTINATION_PORT)) 
datum.setDestinationPort(flow.getDestinationPort());
+               if(showFields.contains(INPUT_INTERFACE)) 
datum.setInputInterface(flow.getInputInterface());
+               if(showFields.contains(MSEC_FIRST_SEEN)) 
datum.setMsecFirstSeen(flow.getMsecFirstSeen());
+               if(showFields.contains(MSEC_LAST_SEEN)) 
datum.setMsecLastSeen(flow.getMsecLastSeen());
+               if(showFields.contains(OUTPUT_INTERFACE)) 
datum.setOutputInterface(flow.getOutputInterface());
+               if(showFields.contains(PACKETS)) 
datum.setPackets(flow.getPackets());
+               if(showFields.contains(PROTOCOL)) 
datum.setProtocol(flow.getProtocol());
+               if(showFields.contains(SOURCE_ADDRESS)) 
datum.setSourceAddress(flow.getSourceAddress());
+               if(showFields.contains(SOURCE_AS_NUMBER)) 
datum.setSourceAsNumber(flow.getSourceAsNumber());
+               if(showFields.contains(SOURCE_PORT)) 
datum.setSourcePort(flow.getSourcePort());
+               if(showFields.contains(TIME_FIRST_SEEN)) 
datum.setTimeFirstSeen(flow.getTimeFirstSeen());
+               if(showFields.contains(TIME_LAST_SEEN)) 
datum.setTimeLastSeen(flow.getTimeLastSeen());
+               if(showFields.contains(TYPE_OF_SERVICE)) 
datum.setTypeOfService(flow.getTypeOfService());
+               if(showFields.contains(TCP_FLAGS)) 
datum.setTcpFlag(flow.getTcpFlag());
                return datum;
        }
 

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/Exporter.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/Exporter.java
      2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/Exporter.java
      2007-10-25 08:56:18 UTC (rev 2993)
@@ -71,11 +71,10 @@
        /**
         * returns a filename that contains data from before time. the file 
name 
         * returned is the filename of the file thats holds the newest data 
before 
-        * time. if there is no file before time it returns the first 
encountered file 
+        * time. if there is no file before time it returns null
         * after time.
         * @param time
         * @return filename
-        * TODO return null if last is null.
         */
        public String getClosestFileBefore(Date time) {
                if(time==null) throw new IllegalArgumentException("time 
cannot be null");
@@ -85,11 +84,8 @@
                        Arrays.sort(sortedFiles);
                        String last = null;
                        for(String file : sortedFiles) {                      
          
-                               if(!(file.compareTo(value)<0)) {
-                                       if(last!=null) {
-                                               return last;
-                                       }
-                                       return file;
+                               if(file.compareTo(value)>0) {
+                                       return last;
                                }
                                last = file;
                        }

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Filter.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Filter.java
        2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Filter.java
        2007-10-25 08:56:18 UTC (rev 2993)
@@ -10,7 +10,7 @@
     
     /**
      * method for retrieving the expression belonging to this filter.
-     * @return a String containing the expression
+     * @return a non-null String containing the expression
      */
     public String getExpression();
 }

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
  2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
  2007-10-25 08:56:18 UTC (rev 2993)
@@ -245,4 +245,8 @@
     public void setTcpFlag(String tcpFlag) {
         this.tcpFlag = tcpFlag;        
     }
+
+    public String getTcpFlag() {
+        return tcpFlag;
+    }
 }

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
        2007-10-25 08:01:35 UTC (rev 2992)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
        2007-10-25 08:56:18 UTC (rev 2993)
@@ -346,6 +346,15 @@
         commands.add(getDirectoryCommandFrom(query));
         commands.add("-R");
         commands.add(query.getStartFile()+":"+query.getEndFile());
+        
+        if (query.getAggegrationRule() != null ) {
+            commands.add("-A");
+            commands.add(query.getAggegrationRule().getExpression());
+        }
+        if (query.getFilter()  != null) {
+            commands.add(query.getFilter().getExpression());
+        }
+        
         return commands;
     }