OpenMRS

Timestamp:

07/25/08 03:37:34 (4 months ago)

Author:

kevjay

Message:

logicws: rudimentary support for flat and stacked style data output. Select between flat and stacked by adding &datastyle=flat or &datastyle=stacked to URL request.

Files:

• openmrs-modules/logicws/.classpath (modified) (1 diff)
• openmrs-modules/logicws/lib-common/openmrs-api-1.3.0.13.4989.jar (deleted)
• openmrs-modules/logicws/lib-common/openmrs-api-1.3.0.13.5027.jar (added)
• openmrs-modules/logicws/lib-common/tests-openmrs-api-1.3.0.13.4989.jar (deleted)
• openmrs-modules/logicws/lib-common/tests-openmrs-api-1.3.0.13.5027.jar (added)
• openmrs-modules/logicws/lib-common/web-openmrs-api-1.3.0.13.4989.jar (deleted)
• openmrs-modules/logicws/lib-common/web-openmrs-api-1.3.0.13.5027.jar (added)
• openmrs-modules/logicws/test/org/openmrs/module/logicws/test/LogicWsHTTPtest.java (modified) (1 diff)
• openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/DataResource.java (modified) (3 diffs)

openmrs-modules/logicws/.classpath

@@ -35 +35 @@
-        <classpathentry kind="lib" path="lib-common/commons-logging-1.1.1.jar"/>
-        <classpathentry kind="lib" path="lib-common/log4j-1.2.15.jar"/>
-4989.jar" sourcepath="/logic-api-refactoring
-4989
-4989
+5027.jar
+5027
+5027
-        <classpathentry kind="output" path="build"/>
-</classpath>

openmrs-modules/logicws/test/org/openmrs/module/logicws/test/LogicWsHTTPtest.java

@@ -186 +186 @@
-        {               
-           // WebRequest req = new PostMethodWebRequest("http://localhost:8080/openmrs/moduleServlet/logicws/api/getData?query=SELECT%20{GENDER}%20FROM%203:org.openmrs.cohort.StaticCohortDefinition");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            try 
-            {

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

@@ -32 +32 @@
-
-                log.info("Data request: " + request.getParameter("query"));
-
+log.info("Data request: " + request.getParameter("datastyle"));
-                
-                switch (operation) {
@@ -119 +119 @@
-                                                                         log.info("<value>" + resByPat.getKey() + "</value>");
-                                                                         
+                                                                         //resByCrit.getValue().get(i).getResultObject().toString();
+                                                                         
-                                                                         out.print("<value>" + resByCrit.getKey().getRootToken() + "</value>");
-                                                                         log.info("<value>" + resByCrit.getKey().getRootToken() + "</value>");
-                                                                         
+                                                                        
-                                                                         out.print("<value>" + resByPat.getValue().get(i).toString() + "</value>");
-                                                                         log.info("<value>" + resByPat.getValue().get(i).toString() + "</value>");
+                                                                         
+                                                                        
+                                                                         /*
+                                                                         out.print("<value>" + resByPat.getValue().get(i).toString() + "</value>");
+                                                                         log.info("<value>" + resByPat.getValue().get(i).toString() + "</value>");
+                                                                         */
-                                                                         
-                                                                         out.print("</row>");
@@ -170 +179 @@
-                                
-                        }
+                        else if(dataQuery.getDataStyle().equals("flat"))
+                        {
+                                int max = 5;
+                                
+                                for (String t : tokenNamesFromQuery)
+                                {
+                                        for(int i = 1; i < max + 1; i++)
+                                        {
+                                                out.print("<column token=\"" + t + "_" + i + "\" />");          
+                                                log.info("<column token=\"" + t + "_" + i + "\" />");
+                                        }
+                                        
+                                }
+                                out.print("</columns>");
+                                log.info("</columns>");
+        
+                                // List rows
+                                out.print("<rows>");
+                                log.info("<rows>");
+                                
+                                Cohort patients;
+                                LogicService ls = Context.getLogicService();
+        
+                                try {
+        
+                                        CohortDefinition cohortDefinition = Context.getCohortService().getCohortDefinition(filter);
+                                        patients = Context.getCohortService().evaluate(cohortDefinition, null);
+                                        
+                                        Map<LogicCriteria, Map<Integer, Result>> resultsForTokens = null;
+                                        try
+                                        {
+                                                resultsForTokens = ls.eval(patients, tokens);
+                                        } 
+                                        catch (LogicException e) 
+                                        {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }       
+                                                                                
+                                        for (Integer patient: patients.getMemberIds()) 
+                                        {
+                                                out.print("<row>");
+                                                log.info("<row>");
+                                                
+                                                //always print the patient id first
+                                                out.print("<value>" + patient + "</value>");
+                                                log.info("<value>" + patient + "</value>");
+                                                
+                                                for (LogicCriteria token: tokens) 
+                                                {
+                                                        Result res = resultsForTokens.get(token).get(patient);
+                                                                                                        
+                                                        for(int i = 0; i < max; i++)
+                                                        {
+                                                                out.print("<value>" + res.get(i) + "</value>");
+                                                                log.info("<value>" + res.get(i) + "</value>");                                                          
+                                                        }                                                
+                                                 }
+                                                
+                                                out.print("</row>");
+                                                log.info("</row>");
+                                        }
+                                        
+                                        out.print("</rows>");
+                                        log.info("</rows>");
+                                
+                                        out.print("</dataset>");
+                                        log.info("<rows>");             
+                                
+                                        break;
+                                } 
+                                
+                                catch (org.openmrs.api.APIAuthenticationException e) 
+                                {
+                                        out.print("<error>" + e.toString()
+                                                        + "</error></rows></dataset>");
+                                        break;
+                                }
+                        }
-                        else
-                        {