Changeset 553

Timestamp:

03/01/11 18:43:13 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model

Files:

• Series.java (modified) (3 diffs)
• StatisticParameters.java (modified) (4 diffs)
• sql/ComparisonPredicate.java (modified) (2 diffs)

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/Series.java

@@ -7 +7 @@
 
 import uk.ac.cardiff.model.sql.ComparisonPredicate;
-import uk.ac.cardiff.model.sql.SQLFilter;
 import uk.ac.cardiff.model.sql.ComparisonPredicate.CompOp;
+
 
 /**
@@ -19 +19 @@
     /* Generated serialUID */
     private static final long serialVersionUID = 2842224280017951256L;
-    
+
     /* The textual description of the series, as attached to the x-axis */
     private String seriesLabel;
@@ -26 +26 @@
     /* a comparison predicate that forms the where clause*/
     private ComparisonPredicate comparisonPredicate;
-    
+
+
     public String constructComparisonAsSQL(){
         if (comparisonPredicate==null) return null;
-        
+
         StringBuilder sql = new StringBuilder();
         sql.append(comparisonPredicate.getFieldName());
         if (comparisonPredicate.getCompOp()==CompOp.EQUAL)sql.append("=");
-        if (comparisonPredicate.getCompOp()==CompOp.NOTEQUAL)sql.append("!=");
+        if (comparisonPredicate.getCompOp()==CompOp.NOT_EQUAL)sql.append("!=");
         sql.append("'"+comparisonPredicate.getValue()+"'");
-        
+
         if (sql.length()==0)return null;
-        
+
         return sql.toString();
     }

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/StatisticParameters.java

@@ -61 +61 @@
          * A statistic for use by the USER. Possibly removed in the future, in favour of individual
          * user based statistics
-         */ 
+         */
          USER,
          /*
-          * A statistic for use by the system level processes, e.g. to generate dashboard 
+          * A statistic for use by the system level processes, e.g. to generate dashboard
           * statistics
           */
          SYSTEM};
-         
+
     private StatisticType type;
 
@@ -134 +134 @@
         this.startTime = formatDate(startTime, false);
         this.startTimeJava = new Date (this.startTime.getMillis());
-        
+
     }
 
@@ -163 +163 @@
 
     /**
-     * for output on the web page 
+     * for output on the web page
      * @param date
      */
@@ -338 +338 @@
     }
 
+
     public void setSeries(List<Series> series) {
         this.series = series;

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/sql/ComparisonPredicate.java

@@ -2 +2 @@
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * [  <comparison predicate>    ::=   <row value expression> <comp op> <row value expression>]
- * 
+ *
  * @author philsmart
  *
  */
 public class ComparisonPredicate implements Serializable{
-    public enum CompOp {EQUAL,NOTEQUAL}
+    /**
+     * Generated SerialUID
+     */
+    private static final long serialVersionUID = 4721780920444284628L;
+
+    static Logger log = LoggerFactory.getLogger(ComparisonPredicate.class);
+
+    public enum CompOp {EQUAL,NOT_EQUAL}
+
     private CompOp compOp;
     private String fieldName;
     private String value;
-    
+
+    private List<String> possibleFieldNameValues;
+
     public void setCompOp(CompOp compOp) {
         this.compOp = compOp;
@@ -33 +48 @@
         return value;
     }
+    public void setPossibleFieldNameValues(List<String> possibleFieldNameValues) {
+        this.possibleFieldNameValues = possibleFieldNameValues;
+    }
+    public List<String> getPossibleFieldNameValues() {
+        return possibleFieldNameValues;
+    }
+    public CompOp[] getPossibleComparisonOperatorValues() {
+        return CompOp.values();
+    }
+
 }