OpenMRS

Timestamp:

08/10/08 18:37:29 (5 months ago)

Author:

kevjay

Message:

logicws: Added initial support for logic service queries with aggregates in the request for all three data styles.

Files:

• openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/URLdataQuery.java (modified) (5 diffs)

openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/URLdataQuery.java

@@ -41 +41 @@
-
-    private Map<String, String[]> tokenSplitters;
+    
+    private Map<String, String> tokenAggregateNames;
+    
+    private Map<String, String> tokenAggregateValues;
+    
+    //private Map<>
-
-    /**
@@ -61 +67 @@
-
-            tokenSplitters = new HashMap<String, String[]>();
+            
+            tokenAggregateNames = new HashMap<String, String>();
+            
+            tokenAggregateValues = new HashMap<String, String>();
-
-            if (query != null) {
@@ -73 +83 @@
-                    tokensWithModifiers = select.split("\\|");
-
-
+, aggregates, and aggregate values
-                    for (int i = 0; i < tokensWithModifiers.length; i++) {
+                        
+                        //get the aggregate name
+                        tokenAggregateNames.put(tokensWithModifiers[i].substring(tokensWithModifiers[i].indexOf("{") + 1, tokensWithModifiers[i].indexOf("}")), tokensWithModifiers[i].split(" ")[0]);
+                                                
+                        //get the aggregate value
+                        tokenAggregateValues.put(tokensWithModifiers[i].substring(tokensWithModifiers[i].indexOf("{") + 1, tokensWithModifiers[i].indexOf("}")), tokensWithModifiers[i].split(" ")[1]);
+                        
-                        if (tokensWithModifiers[i].contains(":")) {
-                            // populate token splitters
@@ -89 +106 @@
-
-                            tokensWithModifiers[i] = tokensWithModifiers[i]
-0
+tokensWithModifiers[i].indexOf("{")
-                                            .indexOf(":"));
-
@@ -123 +140 @@
-        return tokenSplitters.get(token);
-    }
+    
+    public String getTokenAggregateName(String token) {
+        return tokenAggregateNames.get(token);
+    }
+    
+    public String getTokenAggregateValue(String token) {
+        return tokenAggregateValues.get(token);
+    }
+    
-
-    /**