Changeset 516

Timestamp:

02/07/11 22:52:26 (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) (2 diffs)

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

@@ -5 +5 @@
 
 import java.io.Serializable;
+
+import uk.ac.cardiff.model.sql.ComparisonPredicate;
+import uk.ac.cardiff.model.sql.SQLFilter;
+import uk.ac.cardiff.model.sql.ComparisonPredicate.CompOp;
 
 /**
@@ -13 +17 @@
 
 
+    /* Generated serialUID */
+    private static final long serialVersionUID = 2842224280017951256L;
+    
     /* The textual description of the series, as attached to the x-axis */
     private String seriesLabel;
     /* A formatted textual description of the series, typically formatted by the logic of the authentication statistic*/
     private String SeriesLabelFormatted;
+    
+    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("!=");
+        sql.append("'"+comparisonPredicate.getValue()+"'");
+        
+        if (sql.length()==0)return null;
+        
+        return sql.toString();
+    }
 
 
@@ -35 +58 @@
     }
 
+    public void setComparisonPredicate(ComparisonPredicate comparisonPredicate) {
+        this.comparisonPredicate = comparisonPredicate;
+    }
+
+    public ComparisonPredicate getComparisonPredicate() {
+        return comparisonPredicate;
+    }
+
 
 

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

@@ -60 +60 @@
     private StatisticType type;
 
-    /* SQL filter, to add custom where clauses*/
-    private SQLFilter sqlFilter;
 
     /* Configures the parameters used to view a graphical representation*/
@@ -314 +312 @@
     }
 
-    public void setSqlFilter(SQLFilter sqlFilter) {
-        this.sqlFilter = sqlFilter;
-    }
-
-    public SQLFilter getSqlFilter() {
-        return sqlFilter;
-    }
-
     public void setPresentation(Presentation presentation) {
         this.presentation = presentation;