Changeset 434

Timestamp:

01/12/11 23:25:41 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua

Files:

• engine/statistics/AuthenticationStatistic.java (modified) (2 diffs)
• service/MUAProcess.java (modified) (2 diffs)
• service/impl/MUAProcessImpl.java (modified) (2 diffs)
• wsinterface/impl/MultiUnitAggregatorImpl.java (modified) (1 diff)

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/engine/statistics/AuthenticationStatistic.java

@@ -254 +254 @@
         String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
         log.debug("Select {}, tableName {}",groupByField,tableName);
-        List results = getEntryHandler().query("select "+groupByField+",count(*) from "+tableName+" group by ("+groupByField+")");
+        List results = getEntryHandler().query("select "+groupByField+",count(*) from "+tableName+" where (eventTime between '" + start + "' and '" + end + "') group by ("+groupByField+")");
 
         ArrayList<Group> groups = new ArrayList();
@@ -306 +306 @@
         String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
         log.debug("Select {}, tableName {}",groupByField,tableName);
-        List results = getEntryHandler().query("select "+groupByField+" from "+tableName+" group by ("+groupByField+")");
+        List results = getEntryHandler().query("select "+groupByField+" from "+tableName+" where (eventTime between '" + start + "' and '" + end + "') group by ("+groupByField+")");
 
         ArrayList<Group> groups = new ArrayList();

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/service/MUAProcess.java

@@ -32 +32 @@
 public interface MUAProcess {
 
-
+        /**
+         * 
+         */
         public void poll();
 
@@ -59 +61 @@
          */
         public void addAuthentications(UAEntryPush pushed);
+
+        /**
+         * 
+         * @param statisticalUnitInformation
+         * @return
+         */
+        public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation);
 }

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/service/impl/MUAProcessImpl.java

@@ -39 +39 @@
  */
 public class MUAProcessImpl implements MUAProcess {
+        
+        /* class logger */
     static Logger log = LoggerFactory.getLogger(MUAProcessImpl.class);
 
@@ -178 +180 @@
     }
 
+        @Override
+        public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) {
+                if (lockR.tryLock()) {
+                    try {
+                        log.info("Webservice call to update and perform statistic {}",statisticalUnitInformation.getStatisticParameters().getUnitName());
+                        engine.updateStatisticalUnit(statisticalUnitInformation);
+                                return engine.performStatistic(statisticalUnitInformation.getStatisticParameters().getUnitName());
+                    } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                    } finally {
+                        lockR.unlock();
+                    }
+                }
+                return null;
+                
+        }
+
 }

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/wsinterface/impl/MultiUnitAggregatorImpl.java

@@ -109 +109 @@
         }
 
+        @Override
+        public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) {
+                return processService.updateAndInvokeStatisticalUnit(statisticalUnitInformation);
+        }
+
 }