Changeset 500

Timestamp:

01/30/11 23:04:07 (2 years ago)

Author:

philsmart

Message:

added SQL Filter capabilities

Location:

raptor-mua/trunk/src/main

Files:

• java/uk/ac/cardiff/raptormua/engine/statistics/AuthenticationStatistic.java (modified) (1 diff)
• java/uk/ac/cardiff/raptormua/engine/statistics/SQLFilterConstructor.java (added)
• java/uk/ac/cardiff/raptormua/engine/statistics/StatisticsHandler.java (modified) (2 diffs)
• java/uk/ac/cardiff/raptormua/service/impl/MUAProcessImpl.java (modified) (1 diff)
• webapp/WEB-INF/statistical-units.xml (modified) (3 diffs)

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

@@ -39 +39 @@
 /**
  * @author philsmart
- *
- * TODO need to include where filter parameters for most these methods
- *
+ * 
+ *         TODO need to include where filter parameters for most these methods
+ * 
  */
 public class AuthenticationStatistic extends Statistic {
-    static Logger log = LoggerFactory.getLogger(AuthenticationStatistic.class);
-
-    /**
-     * <p>
-     * returns false if semantic error with the entries, throws an exception on code failure
-     * </p>
-     *
-     * @param timeInterval
-     *            - assumes a String representing minutes
-     * @return
-     * @throws StatisticalUnitException
-     */
-    public Boolean countEntryPerInterval(String timeInterval) throws StatisticalUnitException {
-
-        log.debug("Performing countEntryPerInterval Statistical Operation");
-        int timeIntervalInt = Integer.parseInt(timeInterval);
-        // convert minutes to ms for the procedure
-        timeIntervalInt = timeIntervalInt * 60 * 1000;
-        log.debug("Params for method:  {}, {}",statisticParameters.getMethodName(), statisticParameters.getUnitName());
-
-        /* divide the temporal extent into evenly sized buckets */
-        DateTime start = startingTime();
-        DateTime end = endingTime();
-        log.debug("countEntryPerInterval between [start:{}] [end:{}]",start,end);
-        long difference = end.getMillis() - start.getMillis();
-        log.debug("There is " + difference + "ms difference between start and end entries");
-        int numberOfBuckets = (int) (difference / timeIntervalInt);
-        long reminder = difference % timeIntervalInt;
-        log.debug("There are " + numberOfBuckets + " buckets, with reminder " + reminder + "ms");
-
-        /* now create that many buckets of length timeIntervalInt */
-        Bucket[] buckets = null;
-        if (reminder > 0)
-            buckets = new Bucket[numberOfBuckets + 1]; // add 1 for the reminder
-        else
-            buckets = new Bucket[numberOfBuckets];
-
-        buckets[0] = new Bucket();
-        buckets[0].setStart(start);
-        buckets[0].setEnd(new DateTime(start.getMillis() + timeIntervalInt));
-        DateTime endOfEvenBuckets = null;
-        for (int i = 1; i < numberOfBuckets; i++) {
-            Bucket buck = new Bucket();
-            buck.setStart(buckets[i - 1].getEnd());
-            buck.setEnd(new DateTime(buckets[i - 1].getEnd().getMillis() + timeIntervalInt));
-            buckets[i] = buck;
-            endOfEvenBuckets = buck.getEnd();
-        }
-
-        /*
-         * there may only be a reminder if the time frame specified is not big enough to fit the interval specified, in this case the endOfEvenBuckets has not
-         * been set, and it needs setting to the current starttime.
+        static Logger log = LoggerFactory.getLogger(AuthenticationStatistic.class);
+
+        /**
+         * <p>
+         * returns false if semantic error with the entries, throws an exception on
+         * code failure
+         * </p>
+         * 
+         * @param timeInterval
+         *            - assumes a String representing minutes
+         * @param sqlWhere if a SQL filter has been attached to the statistical unit, it is inputed to the method
+         *                                      if there is not SQL filter, it comes through as an empty string (not null)
+         * @return
+         * @throws StatisticalUnitException
          */
-        boolean hasOnlyReminder = false;
-        if (endOfEvenBuckets == null) {
-            hasOnlyReminder = true;
-            endOfEvenBuckets = start;
-        }
-
-        if (reminder > 0) {
-            /* now do something with the reminder, create a bucket from the last entry, to the maximum temporal extent of all entries */
-            Bucket reminderBucket = new Bucket();
-            reminderBucket.setStart(endOfEvenBuckets);
-            if (!hasOnlyReminder)
-                reminderBucket.setEnd(end);
-            else
-                reminderBucket.setEnd(new DateTime(start.getMillis() + end.getMillis()));
-            buckets[buckets.length - 1] = reminderBucket;
-        }
-
-        long testCount = 0;
-        for (Bucket bucket : buckets) {
-            // SQL between is >= start && <= end. We want, >= start && < end, so must exclude equals end
-            Integer count = (Integer) this.getEntryHandler().queryUnique("select count(*) from Entry where (eventTime between '" + bucket.getStart() + "' and '" + bucket.getEnd() + "') and (eventTime !='" + bucket.getEnd() + "')");// new
-                                                                                                                                                                                                                                       // Object[]{start,end});
-            bucket.setValue(count);
-            testCount += bucket.getValue();
-        }
-
-        /*
-         * test count should equal the number of entries unless there is a reminder, or the specified start time and endtime does not completely contain the
-         * entries.
+        public Boolean countEntryPerInterval(String timeInterval, String sqlWhere) throws StatisticalUnitException {
+                log.debug("Performing countEntryPerInterval Statistical Operation");
+                int timeIntervalInt = Integer.parseInt(timeInterval);
+                // convert minutes to ms for the procedure
+                timeIntervalInt = timeIntervalInt * 60 * 1000;
+                log.debug("Params for method:  {}, {}. SQL Filter {}", new Object[]{statisticParameters.getMethodName(), statisticParameters.getUnitName(),sqlWhere});
+
+                /* divide the temporal extent into evenly sized buckets */
+                DateTime start = startingTime();
+                DateTime end = endingTime();
+                log.debug("countEntryPerInterval between [start:{}] [end:{}]", start, end);
+                long difference = end.getMillis() - start.getMillis();
+                log.debug("There is " + difference + "ms difference between start and end entries");
+                int numberOfBuckets = (int) (difference / timeIntervalInt);
+                long reminder = difference % timeIntervalInt;
+                log.debug("There are " + numberOfBuckets + " buckets, with reminder " + reminder + "ms");
+
+                /* now create that many buckets of length timeIntervalInt */
+                Bucket[] buckets = null;
+                if (reminder > 0)
+                        buckets = new Bucket[numberOfBuckets + 1]; // add 1 for the reminder
+                else
+                        buckets = new Bucket[numberOfBuckets];
+
+                buckets[0] = new Bucket();
+                buckets[0].setStart(start);
+                buckets[0].setEnd(new DateTime(start.getMillis() + timeIntervalInt));
+                DateTime endOfEvenBuckets = null;
+                for (int i = 1; i < numberOfBuckets; i++) {
+                        Bucket buck = new Bucket();
+                        buck.setStart(buckets[i - 1].getEnd());
+                        buck.setEnd(new DateTime(buckets[i - 1].getEnd().getMillis() + timeIntervalInt));
+                        buckets[i] = buck;
+                        endOfEvenBuckets = buck.getEnd();
+                }
+
+                /*
+                 * there may only be a reminder if the time frame specified is not big
+                 * enough to fit the interval specified, in this case the
+                 * endOfEvenBuckets has not been set, and it needs setting to the
+                 * current starttime.
+                 */
+                boolean hasOnlyReminder = false;
+                if (endOfEvenBuckets == null) {
+                        hasOnlyReminder = true;
+                        endOfEvenBuckets = start;
+                }
+
+                if (reminder > 0) {
+                        /*
+                         * now do something with the reminder, create a bucket from the last
+                         * entry, to the maximum temporal extent of all entries
+                         */
+                        Bucket reminderBucket = new Bucket();
+                        reminderBucket.setStart(endOfEvenBuckets);
+                        if (!hasOnlyReminder)
+                                reminderBucket.setEnd(end);
+                        else
+                                reminderBucket.setEnd(new DateTime(start.getMillis() + end.getMillis()));
+                        buckets[buckets.length - 1] = reminderBucket;
+                }
+
+                long testCount = 0;
+                for (Bucket bucket : buckets) {
+                        // SQL between is >= start && <= end. We want, >= start && < end, so
+                        // must exclude equals end
+                        String query=null;
+                        if (sqlWhere.equals(""))
+                                query = "select count(*) from Entry where (eventTime between '" + bucket.getStart() + "' and '"
+                                                        + bucket.getEnd() + "') and (eventTime !='" + bucket.getEnd() + "')";
+                        else 
+                                query = "select count(*) from Entry where (eventTime between '" + bucket.getStart() + "' and '"
+                                + bucket.getEnd() + "') and (eventTime !='" + bucket.getEnd() + "') and "+sqlWhere;
+                        Integer count = (Integer) this.getEntryHandler().queryUnique(query);// new
+                        // Object[]{start,end});
+                        bucket.setValue(count);
+                        testCount += bucket.getValue();
+                }
+
+                /*
+                 * test count should equal the number of entries unless there is a
+                 * reminder, or the specified start time and endtime does not completely
+                 * contain the entries.
+                 */
+                log.debug("Entries: " + this.getEntryHandler().getNumberOfEntries() + ", total in buckets: " + testCount);
+
+                if (this.getEntryHandler().getNumberOfEntries() != testCount)
+                        log.error("Ah! Curse your sudden but inevitable betrayal!, Potential statistical error in countEntryPerInterval, total frequency does not match total entries");
+
+                if (statisticParameters.getSeriesLabel() == null)
+                        statisticParameters.setSeriesLabelFormatted("Number of Events per " + timeInterval + " minutes");
+                else {
+                        statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel() + " (every "
+                                        + timeInterval + " minutes, where "+sqlWhere+")");
+                }
+
+                observations = buckets;
+
+                // finished successfully, no exception thrown
+                return true;
+
+        }
+
+        public Boolean countEntry(String numberOfIntervalsString, String sqlWhere) throws StatisticalUnitException {
+
+                int numberOfIntervals = Integer.parseInt(numberOfIntervalsString);
+                log.debug("Performing countEntry Statistical Operation");
+                log.debug("Params for method:  " + statisticParameters.getMethodName() + ", "
+                                + statisticParameters.getUnitName());
+
+                /* divide the temporal extent into evenly sized buckets */
+                DateTime start = startingTime();
+                DateTime end = endingTime();
+                log.debug("countEntry between [start:{}] [end:{}]", start, end);
+                long difference = end.getMillis() - start.getMillis();
+                log.debug("There is " + difference + "ms difference between start and end entries");
+                long timeIntervalsInMs = (long) (difference / numberOfIntervals);
+                long reminder = difference % numberOfIntervals;
+                log.debug("There are " + numberOfIntervals + " buckets, with reminder " + reminder + "ms");
+
+                /* now create that many buckets of length timeIntervalInt */
+                Bucket[] buckets = null;
+                if (reminder > 0)
+                        buckets = new Bucket[numberOfIntervals + 1]; // add 1 for the
+                                                                                                                        // reminder
+                else
+                        buckets = new Bucket[numberOfIntervals];
+
+                buckets[0] = new Bucket();
+                buckets[0].setStart(start);
+                buckets[0].setEnd(new DateTime(start.getMillis() + timeIntervalsInMs));
+                DateTime endOfEvenBuckets = null;
+                for (int i = 1; i < numberOfIntervals; i++) {
+                        Bucket buck = new Bucket();
+                        buck.setStart(buckets[i - 1].getEnd());
+                        buck.setEnd(new DateTime(buckets[i - 1].getEnd().getMillis() + timeIntervalsInMs));
+                        buckets[i] = buck;
+                        endOfEvenBuckets = buck.getEnd();
+                }
+
+                /*
+                 * there may only be a reminder if the time frame specified is not big
+                 * enough to fit the interval specified, in this case the
+                 * endOfEvenBuckets has not been set, and it needs setting to the
+                 * current starttime.
+                 */
+                boolean hasOnlyReminder = false;
+                if (endOfEvenBuckets == null) {
+                        hasOnlyReminder = true;
+                        endOfEvenBuckets = start;
+                }
+
+                if (reminder > 0) {
+                        /*
+                         * now do something with the reminder, create a bucket from the last
+                         * entry, to the maximum temporal extent of all entries
+                         */
+                        Bucket reminderBucket = new Bucket();
+                        reminderBucket.setStart(endOfEvenBuckets);
+                        if (!hasOnlyReminder)
+                                reminderBucket.setEnd(end);
+                        else
+                                reminderBucket.setEnd(new DateTime(start.getMillis() + end.getMillis()));
+                        buckets[buckets.length - 1] = reminderBucket;
+                }
+
+                long testCount = 0;
+                for (Bucket bucket : buckets) {
+                        // SQL between is >= start && <= end. We want, >= start && < end, so
+                        // must exclude equals end
+                        Integer count = (Integer) this.getEntryHandler().queryUnique(
+                                        "select count(*) from Entry where (eventTime between '" + bucket.getStart() + "' and '"
+                                                        + bucket.getEnd() + "') and (eventTime !='" + bucket.getEnd() + "')");// new
+                        // Object[]{start,end});
+                        bucket.setValue(count);
+                        testCount += bucket.getValue();
+                }
+
+                /*
+                 * test count should equal the number of entries unless there is a
+                 * reminder, or the specified start time and endtime does not completely
+                 * contain the entries.
+                 */
+                log.debug("Entries: " + this.getEntryHandler().getNumberOfEntries() + ", total in buckets: " + testCount);
+
+                double timeIntervalInHours = ((((timeIntervalsInMs / 1000) / 60) / 60));
+                double timeIntervalInDays = ((((timeIntervalsInMs / 1000) / 60) / 60) / 24);
+
+                if (this.getEntryHandler().getNumberOfEntries() != testCount)
+                        log.error("Ah! Curse your sudden but inevitable betrayal!, Potential statistical error in countEntryPerInterval, total frequency does not match total entries");
+
+                if (statisticParameters.getSeriesLabel() == null)
+                        statisticParameters.setSeriesLabelFormatted("Number of Events per " + timeIntervalInDays + " days");
+                else {
+                        statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel() + " (every "
+                                        + timeIntervalInDays + " days)");
+                }
+
+                observations = buckets;
+
+                return true;
+
+        }
+
+        /**
+         * Perform the groupByField statistic. This statistic counts the frequency
+         * that each distinct value of the given <code>groupByField</code> occurs in
+         * the entry set. It is the responsibility of this method to throw a
+         * <code>StatisticalUnitException</code> if the code logic fails, or return
+         * false if the statistic functioned correctly, but there are no valid
+         * observations, or true if the statistic succeeds and there are valid
+         * observations.
+         * 
+         * 
+         * @param groupByField
+         * @return
+         * @throws StatisticalUnitException
          */
-        log.debug("Entries: " + this.getEntryHandler().getNumberOfEntries() + ", total in buckets: " + testCount);
-
-        if (this.getEntryHandler().getNumberOfEntries() != testCount)
-            log.error("Ah! Curse your sudden but inevitable betrayal!, Potential statistical error in countEntryPerInterval, total frequency does not match total entries");
-
-        if (statisticParameters.getSeriesLabel() == null)
-            statisticParameters.setSeriesLabelFormatted("Number of Events per " + timeInterval+" minutes");
-        else{
-            statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel()+" (every "+timeInterval+" minutes)");
-        }
-
-        observations = buckets;
-
-        // finished successfully, no exception thrown
-        return true;
-
-    }
-
-    public Boolean countEntry(String numberOfIntervalsString) throws StatisticalUnitException {
-
-        int numberOfIntervals = Integer.parseInt(numberOfIntervalsString);
-        log.debug("Performing countEntry Statistical Operation");
-        log.debug("Params for method:  " + statisticParameters.getMethodName() + ", " + statisticParameters.getUnitName());
-
-        /* divide the temporal extent into evenly sized buckets */
-        DateTime start = startingTime();
-        DateTime end = endingTime();
-        log.debug("countEntry between [start:{}] [end:{}]",start,end);
-        long difference = end.getMillis() - start.getMillis();
-        log.debug("There is " + difference + "ms difference between start and end entries");
-        long timeIntervalsInMs = (long) (difference / numberOfIntervals);
-        long reminder = difference % numberOfIntervals;
-        log.debug("There are " + numberOfIntervals + " buckets, with reminder " + reminder + "ms");
-
-        /* now create that many buckets of length timeIntervalInt */
-        Bucket[] buckets = null;
-        if (reminder > 0)
-            buckets = new Bucket[numberOfIntervals + 1]; // add 1 for the reminder
-        else
-            buckets = new Bucket[numberOfIntervals];
-
-        buckets[0] = new Bucket();
-        buckets[0].setStart(start);
-        buckets[0].setEnd(new DateTime(start.getMillis() + timeIntervalsInMs));
-        DateTime endOfEvenBuckets = null;
-        for (int i = 1; i < numberOfIntervals; i++) {
-            Bucket buck = new Bucket();
-            buck.setStart(buckets[i - 1].getEnd());
-            buck.setEnd(new DateTime(buckets[i - 1].getEnd().getMillis() + timeIntervalsInMs));
-            buckets[i] = buck;
-            endOfEvenBuckets = buck.getEnd();
-        }
-
-        /*
-         * there may only be a reminder if the time frame specified is not big enough to fit the interval specified, in this case the endOfEvenBuckets has not
-         * been set, and it needs setting to the current starttime.
+        public Boolean groupByFrequency(String groupByField, String sqlWhere) throws StatisticalUnitException {
+                log.debug("Performing groupByFrequency Statistical Operation");
+                log.debug("Params for method:  {},{}", statisticParameters.getMethodName(), statisticParameters.getUnitName());
+                log.debug("Grouping field: {}", groupByField);
+
+                DateTime start = startingTime();
+                DateTime end = endingTime();
+                log.debug("groupByFrequency between [start:{}] [end:{}]", start, end);
+                String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
+                log.debug("Select {}, tableName {}", groupByField, tableName);
+                List results = getEntryHandler().query(
+                                "select " + groupByField + ",count(*) from " + tableName + " where (eventTime between '" + start
+                                                + "' and '" + end + "') group by (" + groupByField + ")");
+
+                ArrayList<Group> groups = new ArrayList();
+                int testCount = 0;
+                for (Object result : results) {
+                        Object[] resultAsArray = (Object[]) result;
+                        Group group = new Group();
+                        group.setValue((Integer) resultAsArray[1]);
+                        group.setGroupName((String) resultAsArray[0]);
+                        groups.add(group);
+                        testCount += group.getValue();
+                }
+
+                /*
+                 * test count should equal the number of entries unless there is a
+                 * reminder as this has not been catered for yet.
+                 */
+                log.debug("Entries: {}, total in buckets:{} ", this.getEntryHandler().getNumberOfEntries(), testCount);
+
+                // add the series label or if none specified, add a default
+                if (statisticParameters.getSeriesLabel() == null)
+                        statisticParameters.setSeriesLabelFormatted("Number of Events Grouped By " + groupByField);
+                else {
+                        statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel());
+                }
+
+                observations = groups.toArray(new Group[0]);
+
+                if (observations.length == 0)
+                        return false;
+                // finished successfully, no exception thrown
+                return true;
+
+        }
+
+        /**
+         * Perform the groupByField statistic. This statistic returns a list of
+         * distinct values of the given <code>groupByField</code> field. In contrast
+         * to the <code>groupByFrequency</code> method, it does not count the
+         * occurrence that each distinct value occurs. It is the responsibility of
+         * this method to throw a <code>StatisticalUnitException</code> if the code
+         * logic fails, or return false if the statistic functioned correctly, but
+         * there are no valid observations, or true if the statistic succeeds and
+         * there are valid observations.
+         * 
+         * @param groupByField
+         * @return
+         * @throws StatisticalUnitException
          */
-        boolean hasOnlyReminder = false;
-        if (endOfEvenBuckets == null) {
-            hasOnlyReminder = true;
-            endOfEvenBuckets = start;
-        }
-
-        if (reminder > 0) {
-            /* now do something with the reminder, create a bucket from the last entry, to the maximum temporal extent of all entries */
-            Bucket reminderBucket = new Bucket();
-            reminderBucket.setStart(endOfEvenBuckets);
-            if (!hasOnlyReminder)
-                reminderBucket.setEnd(end);
-            else
-                reminderBucket.setEnd(new DateTime(start.getMillis() + end.getMillis()));
-            buckets[buckets.length - 1] = reminderBucket;
-        }
-
-        long testCount = 0;
-        for (Bucket bucket : buckets) {
-            // SQL between is >= start && <= end. We want, >= start && < end, so must exclude equals end
-            Integer count = (Integer) this.getEntryHandler().queryUnique("select count(*) from Entry where (eventTime between '" + bucket.getStart() + "' and '" + bucket.getEnd() + "') and (eventTime !='" + bucket.getEnd() + "')");// new
-                                                                                                                                                                                                                                       // Object[]{start,end});
-            bucket.setValue(count);
-            testCount += bucket.getValue();
-        }
-
-        /*
-         * test count should equal the number of entries unless there is a reminder, or the specified start time and endtime does not completely contain the
-         * entries.
+        public Boolean groupBy(String groupByField, String sqlWhere) throws StatisticalUnitException {
+                log.debug("Performing groupByFrequency Statistical Operation");
+                log.debug("Params for method:  {},{}", statisticParameters.getMethodName(), statisticParameters.getUnitName());
+                log.debug("Grouping field: {}", groupByField);
+
+                DateTime start = startingTime();
+                DateTime end = endingTime();
+                log.debug("groupBy between [start:{}] [end:{}]", start, end);
+                String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
+                log.debug("Select {}, tableName {}", groupByField, tableName);
+                List results = getEntryHandler().query(
+                                "select " + groupByField + " from " + tableName + " where (eventTime between '" + start + "' and '"
+                                                + end + "') group by (" + groupByField + ")");
+
+                ArrayList<Group> groups = new ArrayList();
+                for (Object result : results) {
+                        Object resultAsArray = (Object) result;
+                        Group group = new Group();
+                        group.setValue(0);
+                        group.setGroupName((String) resultAsArray);
+                        groups.add(group);
+
+                }
+
+                // add the series label or if none specified, add a default
+                if (statisticParameters.getSeriesLabel() == null)
+                        statisticParameters.setSeriesLabel("Distinct Values " + groupByField);
+
+                observations = groups.toArray(new Group[0]);
+
+                if (observations.length == 0)
+                        return false;
+                // finished successfully, no exception thrown
+                return true;
+
+        }
+
+        private DateTime startingTime() {
+                if (statisticParameters.getStartTimeAsDate() != null)
+                        return statisticParameters.getStartTimeAsDate();
+                DateTime start = (DateTime) this.getEntryHandler().queryUnique("select min(eventTime) from Entry");
+                return start;
+        }
+
+        private DateTime endingTime() {
+                if (statisticParameters.getEndTimeAsDate() != null)
+                        return statisticParameters.getEndTimeAsDate();
+                DateTime end = (DateTime) this.getEntryHandler().queryUnique("select max(eventTime) from Entry");
+                return end;
+        }
+
+        /**
+         * <p>
+         * </p>
+         * 
+         * @param date
+         * @param isEndTime
+         *            - if is endTime and only ddMMyyyy is given, then the endTime
+         *            should be 23.59 as opposed to 00.00 as this is the end of the
+         *            day
+         * @return
          */
-        log.debug("Entries: " + this.getEntryHandler().getNumberOfEntries() + ", total in buckets: " + testCount);
-
-        double timeIntervalInHours = ((((timeIntervalsInMs/1000)/60)/60));
-        double timeIntervalInDays = ((((timeIntervalsInMs/1000)/60)/60)/24);
-
-        if (this.getEntryHandler().getNumberOfEntries() != testCount)
-            log.error("Ah! Curse your sudden but inevitable betrayal!, Potential statistical error in countEntryPerInterval, total frequency does not match total entries");
-
-        if (statisticParameters.getSeriesLabel() == null)
-            statisticParameters.setSeriesLabelFormatted("Number of Events per " + timeIntervalInDays+" days");
-        else{
-            statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel()+" (every "+timeIntervalInDays+" days)");
-        }
-
-        observations = buckets;
-
-        return true;
-
-    }
-
-    /**
-     * Perform the groupByField statistic. This statistic counts the frequency that each distinct value of the given <code>groupByField</code> occurs in the
-     * entry set. It is the responsibility of this method to throw a <code>StatisticalUnitException</code> if the code logic fails, or return false if the
-     * statistic functioned correctly, but there are no valid observations, or true if the statistic succeeds and there are valid observations.
-     *
-     *
-     * @param groupByField
-     * @return
-     * @throws StatisticalUnitException
-     */
-    public Boolean groupByFrequency(String groupByField) throws StatisticalUnitException {
-        log.debug("Performing groupByFrequency Statistical Operation");
-        log.debug("Params for method:  {},{}", statisticParameters.getMethodName(), statisticParameters.getUnitName());
-        log.debug("Grouping field: {}", groupByField);
-
-        DateTime start = startingTime();
-        DateTime end = endingTime();
-        log.debug("groupByFrequency between [start:{}] [end:{}]",start,end);
-        String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
-        log.debug("Select {}, tableName {}",groupByField,tableName);
-        List results = getEntryHandler().query("select "+groupByField+",count(*) from "+tableName+" where (eventTime between '" + start + "' and '" + end + "') group by ("+groupByField+")");
-
-        ArrayList<Group> groups = new ArrayList();
-        int testCount =0;
-        for (Object result : results) {
-            Object[] resultAsArray = (Object[])result;
-                Group group = new Group();
-                group.setValue((Integer)resultAsArray[1]);
-                group.setGroupName((String) resultAsArray[0]);
-                groups.add(group);
-                testCount+=group.getValue();
-        }
-
-
-        /* test count should equal the number of entries unless there is a reminder as this has not been catered for yet. */
-        log.debug("Entries: {}, total in buckets:{} ", this.getEntryHandler().getNumberOfEntries(), testCount);
-
-        // add the series label or if none specified, add a default
-        if (statisticParameters.getSeriesLabel() == null)
-            statisticParameters.setSeriesLabelFormatted("Number of Events Grouped By " + groupByField);
-        else{
-            statisticParameters.setSeriesLabelFormatted(statisticParameters.getSeriesLabel());
-        }
-
-        observations = groups.toArray(new Group[0]);
-
-        if (observations.length == 0)
-            return false;
-        // finished successfully, no exception thrown
-        return true;
-
-    }
-
-    /**
-     * Perform the groupByField statistic. This statistic returns a list of distinct values of the given <code>groupByField</code> field. In
-     * contrast to the <code>groupByFrequency</code> method, it does not count the occurrence that each distinct value occurs.
-     *  It is the responsibility of this method to throw a <code>StatisticalUnitException</code> if the code logic fails, or return false if the
-     * statistic functioned correctly, but there are no valid observations, or true if the statistic succeeds and there are valid observations.
-     *
-     * @param groupByField
-     * @return
-     * @throws StatisticalUnitException
-     */
-    public Boolean groupBy(String groupByField) throws StatisticalUnitException {
-        log.debug("Performing groupByFrequency Statistical Operation");
-        log.debug("Params for method:  {},{}", statisticParameters.getMethodName(), statisticParameters.getUnitName());
-        log.debug("Grouping field: {}", groupByField);
-
-        DateTime start = startingTime();
-        DateTime end = endingTime();
-        log.debug("groupBy between [start:{}] [end:{}]",start,end);
-        String tableName = ReflectionHelper.findEntrySubclassForMethod(groupByField);
-        log.debug("Select {}, tableName {}",groupByField,tableName);
-        List results = getEntryHandler().query("select "+groupByField+" from "+tableName+" where (eventTime between '" + start + "' and '" + end + "') group by ("+groupByField+")");
-
-        ArrayList<Group> groups = new ArrayList();
-        for (Object result : results) {
-                Object resultAsArray = (Object)result;
-                Group group = new Group();
-                group.setValue(0);
-                group.setGroupName((String) resultAsArray);
-                groups.add(group);
-
-        }
-
-        // add the series label or if none specified, add a default
-        if (statisticParameters.getSeriesLabel() == null)
-            statisticParameters.setSeriesLabel("Distinct Values " + groupByField);
-
-        observations = groups.toArray(new Group[0]);
-
-        if (observations.length == 0)
-            return false;
-        // finished successfully, no exception thrown
-        return true;
-
-    }
-
-    private DateTime startingTime() {
-        if (statisticParameters.getStartTimeAsDate() != null)
-            return statisticParameters.getStartTimeAsDate();
-        DateTime start = (DateTime) this.getEntryHandler().queryUnique("select min(eventTime) from Entry");
-        return start;
-    }
-
-    private DateTime endingTime() {
-        if (statisticParameters.getEndTimeAsDate() != null)
-            return statisticParameters.getEndTimeAsDate();
-        DateTime end = (DateTime) this.getEntryHandler().queryUnique("select max(eventTime) from Entry");
-        return end;
-    }
-
-    /**
-     * <p>
-     * </p>
-     *
-     * @param date
-     * @param isEndTime
-     *            - if is endTime and only ddMMyyyy is given, then the endTime should be 23.59 as opposed to 00.00 as this is the end of the day
-     * @return
-     */
-    private DateTime formatDate(String date, boolean isEndTime) {
-        /* this is not a nice hack, please tidy */
-        log.debug("Date format being parsed " + date + " with " + date.length() + " characters");
-        if (date.length() == 8) {
-            // assume ddMMyyy
-            String format = "ddMMyyyy";
-            DateTimeFormatter dtf = DateTimeFormat.forPattern(format);
-            DateTime dt = dtf.parseDateTime(date.substring(0, date.length()));
-            if (isEndTime) {
-                dt = new DateTime(dt.getMillis() + 86340000); // where 86340000 is 23.59 hours
-            }
-            log.debug("time set to " + dt.getDayOfMonth() + "th " + dt.getMonthOfYear() + " " + dt.getYear() + " " + dt.getHourOfDay() + ":" + dt.getMinuteOfHour() + ":" + dt.getSecondOfMinute() + " for " + statisticParameters.getUnitName());
-            return dt;
-        } else if (date.length() == 15) {
-            // assume yyyyMMdd'T'HHmmss
-            String format = "yyyyMMdd'T'HHmmss";
-            DateTimeFormatter dtf = DateTimeFormat.forPattern(format);
-            DateTime dt = dtf.parseDateTime(date.substring(0, date.length()));
-            log.debug("time set to " + dt.getDayOfMonth() + "th " + dt.getMonthOfYear() + " " + dt.getYear() + " " + dt.getHourOfDay() + ":" + dt.getMinuteOfHour() + ":" + dt.getSecondOfMinute() + " for " + statisticParameters.getUnitName());
-            return dt;
-        }
-        return new DateTime();
-    }
+        private DateTime formatDate(String date, boolean isEndTime) {
+                /* this is not a nice hack, please tidy */
+                log.debug("Date format being parsed " + date + " with " + date.length() + " characters");
+                if (date.length() == 8) {
+                        // assume ddMMyyy
+                        String format = "ddMMyyyy";
+                        DateTimeFormatter dtf = DateTimeFormat.forPattern(format);
+                        DateTime dt = dtf.parseDateTime(date.substring(0, date.length()));
+                        if (isEndTime) {
+                                dt = new DateTime(dt.getMillis() + 86340000); // where 86340000
+                                                                                                                                // is 23.59
+                                                                                                                                // hours
+                        }
+                        log.debug("time set to " + dt.getDayOfMonth() + "th " + dt.getMonthOfYear() + " " + dt.getYear() + " "
+                                        + dt.getHourOfDay() + ":" + dt.getMinuteOfHour() + ":" + dt.getSecondOfMinute() + " for "
+                                        + statisticParameters.getUnitName());
+                        return dt;
+                } else if (date.length() == 15) {
+                        // assume yyyyMMdd'T'HHmmss
+                        String format = "yyyyMMdd'T'HHmmss";
+                        DateTimeFormatter dtf = DateTimeFormat.forPattern(format);
+                        DateTime dt = dtf.parseDateTime(date.substring(0, date.length()));
+                        log.debug("time set to " + dt.getDayOfMonth() + "th " + dt.getMonthOfYear() + " " + dt.getYear() + " "
+                                        + dt.getHourOfDay() + ":" + dt.getMinuteOfHour() + ":" + dt.getSecondOfMinute() + " for "
+                                        + statisticParameters.getUnitName());
+                        return dt;
+                }
+                return new DateTime();
+        }
 
 }

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

@@ -28 +28 @@
 import uk.ac.cardiff.model.Entry;
 import uk.ac.cardiff.model.Graph.AggregatorGraphModel;
+import uk.ac.cardiff.model.sql.SQLFilter;
 import uk.ac.cardiff.model.wsmodel.MethodParameter;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
@@ -36 +37 @@
  */
 public class StatisticsHandler {
-    static Logger log = LoggerFactory.getLogger(StatisticsHandler.class);
+        static Logger log = LoggerFactory.getLogger(StatisticsHandler.class);
 
-    private List<Statistic> statisticalUnits;
+        private List<Statistic> statisticalUnits;
 
-    private EntryHandler entryHandler;
+        private EntryHandler entryHandler;
 
-    public void setStatisticalUnits(List<Statistic> statisticalUnits) {
-        this.statisticalUnits = statisticalUnits;
-    }
-
-    public List<Statistic> getStatisticalUnits() {
-        return statisticalUnits;
-    }
-
-    /**
-     * @param statisticName
-     */
-    public AggregatorGraphModel peformStatistic(String statisticName) {
-        for (Statistic statistic : statisticalUnits) {
-            if (statistic.getStatisticParameters().getUnitName().equals(statisticName)) {
-                return performStatiticalPipeline(statistic); 
-            }
-        }
-        return null;
-    }
-
-    private AggregatorGraphModel performStatiticalPipeline(Statistic statistic) {
-        // on set entries, also perform preprocessing, could be done as an extra method call
-        statistic.setEntryHandler(entryHandler);
-        Boolean success = invoke(statistic);
-        log.info("Statistic succedded " + success);
-        if (success) {
-            // now send through post processor
-            statistic.postProcess();
-            return statistic.constructGraphModel();
-        }
-        return null;
-    }
-
-    /**
-     * @param statistic
-     */
-    private Boolean invoke(Statistic statistic) {
-        if (this.getEntryHandler() != null)
-            log.debug("Working off " + this.getEntryHandler().getNumberOfEntries() + " entries");
-
-        /* stop processing if there are no valid entries */
-        if (this.getEntryHandler() == null || this.getEntryHandler().getNumberOfEntries() == 0) {
-            log.error("Not enough entries to perform statistic countEntryPerInterval");
-            return false;
+        public void setStatisticalUnits(List<Statistic> statisticalUnits) {
+                this.statisticalUnits = statisticalUnits;
         }
 
-        try {
-            List<MethodParameter> params = statistic.getStatisticParameters().getMethodParams();
-            Object[] paramsO = new Object[params.size()];
-            for (int i = 0; i < paramsO.length; i++) {
-                paramsO[i] = params.get(i).getParameter();
-            }
-            return invoke(statistic.getStatisticParameters().getMethodName(), paramsO, statistic);
-        } catch (Exception e) {
-            e.printStackTrace();
+        public List<Statistic> getStatisticalUnits() {
+                return statisticalUnits;
         }
-        return null;
 
-    }
+        /**
+         * @param statisticName
+         */
+        public AggregatorGraphModel peformStatistic(String statisticName) {
+                for (Statistic statistic : statisticalUnits) {
+                        if (statistic.getStatisticParameters().getUnitName().equals(statisticName)) {
+                                return performStatiticalPipeline(statistic);
+                        }
+                }
+                return null;
+        }
 
-    private Boolean invoke(String fieldname, Object[] params, Object object) {
-        try {
-            Class id = object.getClass();
-            Class[] paramC = new Class[params.length];
-            for (int i = 0; i < params.length; i++) {
-                paramC[i] = params[i].getClass();
-            }
-            log.debug("Calling method: " + fieldname + " on " + object);
-            Method statisticalMethod = id.getMethod(fieldname, paramC);
-            // log.debug("Trying to Set :"+setter);
-            Boolean success = (Boolean) statisticalMethod.invoke(object, params);
-            return success;
-        } catch (Throwable e) {
-            log.error("Field name '" + fieldname + "' does not match internal model attribute");
-            e.printStackTrace();
-            // System.exit(1);
+        private AggregatorGraphModel performStatiticalPipeline(Statistic statistic) {
+                // on set entries, also perform preprocessing, could be done as an extra
+                // method call
+                statistic.setEntryHandler(entryHandler);
+                Boolean success = invoke(statistic);
+                log.info("Statistic succedded " + success);
+                if (success) {
+                        // now send through post processor
+                        statistic.postProcess();
+                        return statistic.constructGraphModel();
+                }
+                return null;
+        }
+
+        /**
+         * @param statistic
+         */
+        private Boolean invoke(Statistic statistic) {
+                if (this.getEntryHandler() != null)
+                        log.debug("Working off " + this.getEntryHandler().getNumberOfEntries() + " entries");
+
+                /* stop processing if there are no valid entries */
+                if (this.getEntryHandler() == null || this.getEntryHandler().getNumberOfEntries() == 0) {
+                        log.error("Not enough entries to perform statistic countEntryPerInterval");
+                        return false;
+                }
+
+                try {
+                        List<MethodParameter> params = statistic.getStatisticParameters().getMethodParams();
+                        SQLFilter sqlFilter = statistic.getStatisticParameters().getSqlFilter();
+                        String whereClause=null;
+                        if (sqlFilter !=null){
+                                SQLFilterConstructor sqlConstructor = new SQLFilterConstructor(sqlFilter);
+                                whereClause = sqlConstructor.convertFilterToString();
+                        }                       
+                        Object[] paramsO = new Object[params.size() + 1];
+                        for (int i = 0; i < paramsO.length-1; i++) {
+                                paramsO[i] = params.get(i).getParameter();
+                        }
+                        if (whereClause!=null)
+                                paramsO[paramsO.length - 1] = whereClause;
+                        else 
+                                paramsO[paramsO.length - 1] = new String();
+                        return invoke(statistic.getStatisticParameters().getMethodName(), paramsO, statistic);
+                } catch (Exception e) {
+                        log.error("Failed to invoke statistics {} -> {}",statistic.getStatisticParameters().getUnitName(),e.getMessage());
+                        e.printStackTrace();
+                }
+                return null;
 
         }
-        return null;
-    }
 
-    /**
-     * updates a statistical unit based on the values in the <code>statisticalUnitInformation</code> parameter Not a very good primary key (unit name) should be
-     * something else
-     *
-     * @param statisticalUnitInformation
-     */
-    public void updateStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) {
-        log.info("Updating statistical unit {} ", statisticalUnitInformation.getStatisticParameters().getUnitName());
-        Statistic toUpdate = null;
-        for (Statistic statistic : statisticalUnits) {
-            if (statistic.getStatisticParameters().getUnitName().equals(statisticalUnitInformation.getStatisticParameters().getUnitName()))
-                toUpdate = statistic;
+        private Boolean invoke(String fieldname, Object[] params, Object object) {
+                try {
+                        Class id = object.getClass();
+                        Class[] paramC = new Class[params.length];
+                        for (int i = 0; i < params.length; i++) {
+                                paramC[i] = params[i].getClass();
+                        }
+                        log.debug("Calling method: " + fieldname + " on " + object);
+                        Method statisticalMethod = id.getMethod(fieldname, paramC);
+                        // log.debug("Trying to Set :"+setter);
+                        Boolean success = (Boolean) statisticalMethod.invoke(object, params);
+                        return success;
+                } catch (Throwable e) {
+                        log.error("Field name '" + fieldname + "' does not match internal model attribute");
+                        e.printStackTrace();
+                        // System.exit(1);
+
+                }
+                return null;
         }
-        log.debug("Found Statistic {} to update", toUpdate);
-        update(toUpdate, statisticalUnitInformation);
 
-    }
+        /**
+         * updates a statistical unit based on the values in the
+         * <code>statisticalUnitInformation</code> parameter Not a very good primary
+         * key (unit name) should be something else
+         * 
+         * @param statisticalUnitInformation
+         */
+        public void updateStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) {
+                log.info("Updating statistical unit {} ", statisticalUnitInformation.getStatisticParameters().getUnitName());
+                Statistic toUpdate = null;
+                for (Statistic statistic : statisticalUnits) {
+                        if (statistic.getStatisticParameters().getUnitName()
+                                        .equals(statisticalUnitInformation.getStatisticParameters().getUnitName()))
+                                toUpdate = statistic;
+                }
+                log.debug("Found Statistic {} to update", toUpdate);
+                update(toUpdate, statisticalUnitInformation);
 
-    /**
-     * Only currently updates certain values, these will need to be completed in the future
-     *
-     * @param statistic
-     * @param statisticalUnitInformation
-     */
-    private void update(Statistic statistic, StatisticalUnitInformation statisticalUnitInformation) {
-        if (statisticalUnitInformation.getStatisticParameters().getEndTimeAsDate()!=null)
-            statistic.getStatisticParameters().setEndTime(statisticalUnitInformation.getStatisticParameters().getEndTimeAsDate());
-        if (statisticalUnitInformation.getStatisticParameters().getStartTimeAsDate()!=null)
-            statistic.getStatisticParameters().setStartTime(statisticalUnitInformation.getStatisticParameters().getStartTimeAsDate());
-        if (statisticalUnitInformation.getStatisticParameters().getMethodParams()!=null)
-            statistic.getStatisticParameters().setMethodParams(statisticalUnitInformation.getStatisticParameters().getMethodParams());
-        if (statisticalUnitInformation.getStatisticParameters().getSeriesLabel()!=null)
-            statistic.getStatisticParameters().setSeriesLabel(statisticalUnitInformation.getStatisticParameters().getSeriesLabel());
-    }
+        }
 
-    /**
-     *
-     * @param entryHandler
-     */
-    public void setEntryHandler(EntryHandler entryHandler) {
-        this.entryHandler = entryHandler;
-    }
+        /**
+         * Only currently updates certain values, these will need to be completed in
+         * the future
+         * 
+         * @param statistic
+         * @param statisticalUnitInformation
+         */
+        private void update(Statistic statistic, StatisticalUnitInformation statisticalUnitInformation) {
+                if (statisticalUnitInformation.getStatisticParameters().getEndTimeAsDate() != null)
+                        statistic.getStatisticParameters().setEndTime(
+                                        statisticalUnitInformation.getStatisticParameters().getEndTimeAsDate());
+                if (statisticalUnitInformation.getStatisticParameters().getStartTimeAsDate() != null)
+                        statistic.getStatisticParameters().setStartTime(
+                                        statisticalUnitInformation.getStatisticParameters().getStartTimeAsDate());
+                if (statisticalUnitInformation.getStatisticParameters().getMethodParams() != null)
+                        statistic.getStatisticParameters().setMethodParams(
+                                        statisticalUnitInformation.getStatisticParameters().getMethodParams());
+                if (statisticalUnitInformation.getStatisticParameters().getSeriesLabel() != null)
+                        statistic.getStatisticParameters().setSeriesLabel(
+                                        statisticalUnitInformation.getStatisticParameters().getSeriesLabel());
+        }
 
-    /**
-     *
-     * @return
-     */
-    public EntryHandler getEntryHandler() {
-        return entryHandler;
-    }
+        /**
+         * 
+         * @param entryHandler
+         */
+        public void setEntryHandler(EntryHandler entryHandler) {
+                this.entryHandler = entryHandler;
+        }
+
+        /**
+         * 
+         * @return
+         */
+        public EntryHandler getEntryHandler() {
+                return entryHandler;
+        }
 
 }

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

@@ -38 +38 @@
 
 /**
- * All operations should go through this service class, so as to obey locks and synchronisation issues. Locks collisions are thrown
- * use a <code>SoapFault</code>. Fault codes are:
- * Client (if a malformed input e.g. statistic name is wrong)
- * Server (we use for locks, as server side issue)
- * VersionMismatch
- * MustUnderstand
- *
+ * All operations should go through this service class, so as to obey locks and
+ * synchronisation issues. Locks collisions are thrown use a
+ * <code>SoapFault</code>. Fault codes are: Client (if a malformed input e.g.
+ * statistic name is wrong) Server (we use for locks, as server side issue)
+ * VersionMismatch MustUnderstand
+ * 
  * @author philsmart
- *
+ * 
  */
 public class MUAProcessImpl implements MUAProcess {
 
-    /* class logger */
-    static Logger log = LoggerFactory.getLogger(MUAProcessImpl.class);
-
-    /* main engine of the MultiUnitAggregator */
-    private MUAEngine engine;
-
-    /*
-     * ReentrantLock to prevent more than at the same time
-     */
-    final Lock lockR = new ReentrantLock();
-
-    public void setEngine(MUAEngine engine) {
-        this.engine = engine;
-    }
-
-    public MUAEngine getEngine() {
-        return engine;
-    }
-
-    /*
-     * The MUA no longer polls for data from the UA, but this is still here in case it is needed
-     *
-     * (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#poll()
-     */
-    public void poll() {
-        if (lockR.tryLock()) {
-            try {
-                // engine.poll();
-            } catch (Exception e) {
-                // TODO either throw as service output, or deal with here
-                log.error(e.getMessage());
-                e.printStackTrace();
-            } finally {
-                lockR.unlock();
-            }
-        }
-
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#performStatistics(java.lang .String)
-     */
-    public AggregatorGraphModel performStatistic(String statisticName) throws SoapFault{
-        if (lockR.tryLock()) {
-            try {
-                log.info("WebSservice call for perform statistic {} ", statisticName);
-                return engine.performStatistic(statisticName);
-            } catch (Exception e) {
-                // TODO either throw as service output, or deal with here
-                log.error(e.getMessage());
-                e.printStackTrace();
-            } finally {
-                lockR.unlock();
-            }
-        }
-        log.warn("Lock was hit for method performStatistic");
-        throw new SoapFault("lock was hit on method performStatistic", new QName("Server"));
-
-    }
-
-    /*
-     * Method does not need to be locked. (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#getCapabilities()
-     */
-    public Capabilities getCapabilities() {
-        log.info("WebSservice call for get capabilities");
-        return engine.getCapabilities();
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#setStatisticalUnit(uk.ac.cardiff .model.wsmodel.StatisticalUnitInformation)
-     */
-    @Override
-    public void updateStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) throws SoapFault {
-        boolean success = false;
-        if (lockR.tryLock()) {
-            try {
-                log.info("Updating statistical unit {}",statisticalUnitInformation.getStatisticParameters().getUnitName());
-                engine.updateStatisticalUnit(statisticalUnitInformation);
-                success = true;
-            } catch (Exception e) {
-                // TODO either throw as service output, or deal with here
-                log.error(e.getMessage());
-                e.printStackTrace();
-            } finally {
-                lockR.unlock();
-            }
-        }
-        if (!success){
-            log.warn("Lock was hit for method updateStatisticalUnit");
-            throw new SoapFault("lock was hit on method updateStatisticalUnit", new QName("Server"));
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#performAdministrativeFunction (uk.ac.cardiff.model.AdministrativeFunction.AdministrativeFunctionType)
-     */
-    @Override
-    public boolean performAdministrativeFunction(AdministrativeFunction function) throws SoapFault {
-        if (lockR.tryLock()) {
-            try {
-                log.info("Performing administrative function {}, request orginates from {}", function.getAdministrativeFunction(), function.getRequester());
-                return engine.performAdministrativeFunction(function);
-            } catch (Exception e) {
-                // TODO either throw as service output, or deal with here
-                log.error(e.getMessage());
-                e.printStackTrace();
-                return false;
-            } finally {
-                lockR.unlock();
-
-            }
-
-        }
-        log.warn("Lock was hit for method performAdministrativeFunction");
-        throw new SoapFault("lock was hit on method performAdministrativeFunction", new QName("Server"));
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see uk.ac.cardiff.raptormua.service.MUAProcess#addAuthentications(uk.ac.cardiff .model.wsmodel.UAEntryPush)
-     */
-    @Override
-    public void addAuthentications(UAEntryPush pushed) {
-        boolean success = false;
-        if (lockR.tryLock()) {
-            try {
-                log.info("MUA has received {} entries from {}", pushed.getEntries().size(), pushed.getUaMetaData().getUaName());
-                engine.addAuthentications(pushed);
-                success = true;
-            } catch (Exception e) {
-                // TODO either throw as service output, or deal with here
-                log.error(e.getMessage());
-                e.printStackTrace();
-            } finally {
-                lockR.unlock();
-
-            }
-        }
-        if (!success)
-            log.warn("Lock was hit for method addAuthentications");
-
-    }
-
-    @Override
-    public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) throws SoapFault {
-        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();
-            }
-        }
-        log.warn("Lock was hit for method updateAndInvokeStatisticalUnit");
-        throw new SoapFault("lock was hit on method updateAndInvokeStatisticalUnit", new QName("Server"));
-
-    }
+        /* class logger */
+        static Logger log = LoggerFactory.getLogger(MUAProcessImpl.class);
+
+        /* main engine of the MultiUnitAggregator */
+        private MUAEngine engine;
+
+        /*
+         * ReentrantLock to prevent more than at the same time
+         */
+        final Lock lockR = new ReentrantLock();
+
+        public void setEngine(MUAEngine engine) {
+                this.engine = engine;
+        }
+
+        public MUAEngine getEngine() {
+                return engine;
+        }
+
+        /*
+         * The MUA no longer polls for data from the UA, but this is still here in
+         * case it is needed
+         * 
+         * (non-Javadoc)
+         * 
+         * @see uk.ac.cardiff.raptormua.service.MUAProcess#poll()
+         */
+        public void poll() {
+                if (lockR.tryLock()) {
+                        try {
+                                // engine.poll();
+                        } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                        } finally {
+                                lockR.unlock();
+                        }
+                }
+
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * uk.ac.cardiff.raptormua.service.MUAProcess#performStatistics(java.lang
+         * .String)
+         */
+        public AggregatorGraphModel performStatistic(String statisticName) throws SoapFault {
+                if (lockR.tryLock()) {
+                        try {
+                                log.info("WebSservice call for perform statistic {} ", statisticName);
+                                return engine.performStatistic(statisticName);
+                        } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                        } finally {
+                                lockR.unlock();
+                        }
+                }
+                log.warn("Lock was hit for method performStatistic");
+                throw new SoapFault("lock was hit on method performStatistic", new QName("Server"));
+
+        }
+
+        /*
+         * Method does not need to be locked. (non-Javadoc)
+         * 
+         * @see uk.ac.cardiff.raptormua.service.MUAProcess#getCapabilities()
+         */
+        public Capabilities getCapabilities() {
+                log.info("WebSservice call for get capabilities");
+                return engine.getCapabilities();
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * uk.ac.cardiff.raptormua.service.MUAProcess#setStatisticalUnit(uk.ac.cardiff
+         * .model.wsmodel.StatisticalUnitInformation)
+         */
+        @Override
+        public void updateStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation) throws SoapFault {
+                boolean success = false;
+                if (lockR.tryLock()) {
+                        try {
+                                log.info("Updating statistical unit {}", statisticalUnitInformation.getStatisticParameters()
+                                                .getUnitName());
+                                engine.updateStatisticalUnit(statisticalUnitInformation);
+                                success = true;
+                        } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                        } finally {
+                                lockR.unlock();
+                        }
+                }
+                if (!success) {
+                        log.warn("Lock was hit for method updateStatisticalUnit");
+                        throw new SoapFault("lock was hit on method updateStatisticalUnit", new QName("Server"));
+                }
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * uk.ac.cardiff.raptormua.service.MUAProcess#performAdministrativeFunction
+         * (uk.ac.cardiff.model.AdministrativeFunction.AdministrativeFunctionType)
+         */
+        @Override
+        public boolean performAdministrativeFunction(AdministrativeFunction function) throws SoapFault {
+                if (lockR.tryLock()) {
+                        try {
+                                log.info("Performing administrative function {}, request orginates from {}",
+                                                function.getAdministrativeFunction(), function.getRequester());
+                                return engine.performAdministrativeFunction(function);
+                        } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                                return false;
+                        } finally {
+                                lockR.unlock();
+
+                        }
+
+                }
+                log.warn("Lock was hit for method performAdministrativeFunction");
+                throw new SoapFault("lock was hit on method performAdministrativeFunction", new QName("Server"));
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * uk.ac.cardiff.raptormua.service.MUAProcess#addAuthentications(uk.ac.cardiff
+         * .model.wsmodel.UAEntryPush)
+         */
+        @Override
+        public void addAuthentications(UAEntryPush pushed) {
+                boolean success = false;
+                if (lockR.tryLock()) {
+                        try {
+                                log.info("MUA has received {} entries from {}", pushed.getEntries().size(), pushed.getUaMetaData()
+                                                .getUaName());
+                                engine.addAuthentications(pushed);
+                                success = true;
+                        } catch (Exception e) {
+                                // TODO either throw as service output, or deal with here
+                                log.error(e.getMessage());
+                                e.printStackTrace();
+                        } finally {
+                                lockR.unlock();
+
+                        }
+                }
+                if (!success)
+                        log.warn("Lock was hit for method addAuthentications");
+
+        }
+
+        @Override
+        public AggregatorGraphModel updateAndInvokeStatisticalUnit(StatisticalUnitInformation statisticalUnitInformation)
+                        throws SoapFault {
+                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();
+                        }
+                }
+                log.warn("Lock was hit for method updateAndInvokeStatisticalUnit");
+                throw new SoapFault("lock was hit on method updateAndInvokeStatisticalUnit", new QName("Server"));
+
+        }
 
 }

raptor-mua/trunk/src/main/webapp/WEB-INF/statistical-units.xml

@@ -36 +36 @@
                                 <ref bean="bottom5Resources"/>
                                 <ref bean="numberOfAuthenticationsPerIntervalNumber"/>
+                                <ref bean="authenticationsForOneSP"/>
                         </list>
                 </property>
@@ -165 +166 @@
 
 
+        <bean id="authenticationsForOneSP" class="uk.ac.cardiff.raptormua.engine.statistics.AuthenticationStatistic">
+                <property name="statisticParameters">
+                        <bean class="uk.ac.cardiff.model.StatisticParameters">
+                                        <property name="statisticType"><value>User</value></property>
+                                        <property name="unitName"><value>Authentications Over Time For A Single SP (by Organisational Name)</value></property>
+                                        <property name="methodName"><value>countEntryPerInterval</value></property>
+                                        <property name="startTime"><value>20101020T140000</value></property>   <!-- presently only ddMMyyy or yyyyMMdd'T'HHmmss -->
+                                        <property name="endTime"><value>20110115T170000</value></property>  <!-- presently only ddMMyyy or yyyyMMdd'T'HHmmss e.g. 20101020T225100Z -->
+                                        <property name="seriesLabel"><value>Number of authentications for service provider</value></property>
+                                        <property name="methodParams">
+                                                <list>
+                                                        <bean class="uk.ac.cardiff.model.wsmodel.MethodParameter">
+                                                                <property name="parameter"><value>1000</value></property>
+                                                        </bean>
+                                                </list>
+                                        </property>
+                                        <property name="sqlFilter"><ref bean="testWhere"></ref></property>
+                        </bean>
+                </property>
+                <property name="postprocessor">
+                        <list>
+                                <ref bean="ShibbolethMetadataNameFormatter"></ref>
+                        </list>
+                </property>
+        </bean>
 
         <!--  Support statistical workflows -->
@@ -190 +216 @@
 
         <bean id="numberFormat" class = "uk.ac.cardiff.raptormua.engine.statistics.NumberFormatterPostProcessor">
+        </bean>
+        
+        <!-- test SQL where filters , follows subset of SQL-99 spec, but too verbose-->
+        
+        <bean id="testWhere" class="uk.ac.cardiff.model.sql.SQLWhere">
+                <property name="booleanExpression">
+                        <bean class="uk.ac.cardiff.model.sql.BooleanExpression">
+                                <property name="booleanTerm">
+                                        <bean class="uk.ac.cardiff.model.sql.BooleanTerm">
+                                                <property name="booleanFactor">
+                                                        <bean class="uk.ac.cardiff.model.sql.BooleanFactor">
+                                                                <property name="booleanTest">
+                                                                        <bean class="uk.ac.cardiff.model.sql.BooleanTest">
+                                                                                <property name="booleanPrimary">
+                                                                                        <bean class="uk.ac.cardiff.model.sql.BooleanPrimary">
+                                                                                                <property name="predicate">
+                                                                                                        <bean class="uk.ac.cardiff.model.sql.Predicate">
+                                                                                                                <property name="comparisonPredicate">
+                                                                                                                        <bean class="uk.ac.cardiff.model.sql.ComparisonPredicate">
+                                                                                                                                <property name="compOp" value="EQUAL"/>
+                                                                                                                                <property name="fieldName" value="requestHost"/>
+                                                                                                                                <property name="value" value="https://sdauth.sciencedirect.com/"/>
+                                                                                                                        </bean>
+                                                                                                                </property>
+                                                                                                        </bean>
+                                                                                                </property>                                                                                     
+                                                                                        </bean>
+                                                                                </property>
+                                                                        </bean>
+                                                                </property>
+                                                        </bean>
+                                                </property>
+                                        </bean>
+                                </property>
+                        </bean>
+                </property> 
+        
         </bean>