OpenMRS

Timestamp:

07/28/08 00:29:36 (4 months ago)

Author:

kevjay

Message:

logicws: Added support for 3 different data styles: most recent, stacked, and flat. Added support for splitting tokens into observation date, observation location, encounter date, and encounter type.

Files:

• openmrs-modules/logicws/.classpath (modified) (1 diff)
• openmrs-modules/logicws/lib-common/hsqldb.jar (added)
• openmrs-modules/logicws/test/org/openmrs/module/logicws/test/LogicWsHTTPtest.java (modified) (1 diff)
• openmrs-modules/logicws/test/org/openmrs/module/logicws/test/LogicWsTest.java (modified) (5 diffs)
• openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/DataResource.java (modified) (14 diffs)
• openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/URLdataQuery.java (modified) (6 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"/>
-
+ sourcepath="/logic-api-refactoring"
-        <classpathentry kind="lib" path="lib-common/tests-openmrs-api-1.3.0.13.5027.jar"/>
-        <classpathentry kind="lib" path="lib-common/web-openmrs-api-1.3.0.13.5027.jar"/>
+        <classpathentry kind="lib" path="lib-common/hsqldb.jar"/>
-        <classpathentry kind="output" path="build"/>
-</classpath>

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

@@ -213 +213 @@
-        {               
-           // 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/test/org/openmrs/module/logicws/test/LogicWsTest.java

@@ -9 +9 @@
-import org.apache.commons.logging.LogFactory;
-import org.openmrs.Cohort;
+import org.openmrs.Obs;
-import org.openmrs.api.context.Context;
-import org.openmrs.cohort.CohortDefinition;
@@ -28 +29 @@
-        private static Log log = LogFactory.getLog(LogicWsTest.class);
-
+        /*
+        @Override
+        protected void onSetUpInTransaction() throws Exception {
+                initializeInMemoryDatabase();
+                
+                executeDataSet("org/openmrs/module/logicws/test/include/LogicServiceIssue.xml");
+                
+                authenticate();
+        }
+        */
+        
-        @Override
-        protected void onSetUpBeforeTransaction() throws Exception {
@@ -93 +105 @@
-        public void testGetStackedData()
-        {
-5
+3
-                Cohort patients = Context.getCohortService().evaluate(cohortDefinition, null);
-                
@@ -134 +146 @@
-                                                 System.out.println("<value>" + resByPat.getValue().get(i).toString() + "</value>");
-                                                 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                 save = resByPat.getValue().get(i).toString();
-                                                
@@ -151 +175 @@
-                                         System.out.println("<value>" + resByPat.getValue().toString() + "</value>");
-                                         
+                                         System.out.println("<value>" + resByPat.getValue().getResultDate() + "</value>");
+                                         
+                                         Obs obs = (Obs) resByPat.getValue().getResultObject();
+                                         
+                                         if(obs != null)
+                                         {
+                                                 System.out.println("<value>" + obs.getLocation() + "</value>");        
+                                                 
+                                                 
+                                                 
+                                                 System.out.println("<value>" + obs.getEncounter().getEncounterDatetime() + "</value>");
+                                                 
+                                                 System.out.println("<value>" + obs.getEncounter().getEncounterType() + "</value>");
+                                                 
+                                                 System.out.println("</row>");
+                                         }
+                                
-                                         System.out.println("</row>");
-                                         

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

@@ -3 +3 @@
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.util.HashSet;
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.Set;
-
-import javax.servlet.ServletException;
@@ -14 +16 @@
-import org.apache.commons.logging.LogFactory;
-import org.openmrs.Cohort;
+import org.openmrs.Obs;
-import org.openmrs.logic.LogicCriteria;
-import org.openmrs.logic.LogicService;
-import org.openmrs.logic.result.Result;
+import org.openmrs.logic.result.Result.Datatype;
-import org.openmrs.logic.LogicException;
-import org.openmrs.api.context.Context;
@@ -25 +29 @@
-public class DataResource implements RestResource {
-
+        private static final String ENCOUNTERDATE = "ENCOUNTERDATE";
+        private static final String ENCOUNTERTYPE = "ENCOUNTERTYPE";
+        private static final String OBSERVATIONLOCATION = "OBSERVATIONLOCATION";
+        private static final String OBSERVATIONDATE = "OBSERVATIONDATE";
-        private Log log = LogFactory.getLog(this.getClass());
-        
@@ -38 +46 @@
-                        URLdataQuery dataQuery = new URLdataQuery(request);
-                        
+                        log.info("Built query");
+                        
-                        String filter = dataQuery.getFilter();
-                        
@@ -53 +63 @@
-                        {
-                                tokens.add(LogicCriteria.parse(tokensFromQuery[i]));            
-                                //tokens.add(new LogicCriteria(tokensFromQuery[i]));
-                        }
-                                
@@ -77 +86 @@
-                                out.print("<column token=\"VALUE\" />");
-                                log.info("<column token=\"VALUE\" />");
+                                
+                                //add the neccessary splitter columns
+                                //if any of the tokens split, we need to include this column
+                                Set<String> uniqueSplits = new HashSet<String>();
+                                
+                                for(int i = 0; i < tokenNamesFromQuery.length; i++)
+                                {
+                                        String[] splits = dataQuery.getTokenSplits(tokenNamesFromQuery[i]);
+                                        
+                                        if(splits != null)
+                                        {
+                                                for(int j = 0; j < splits.length; j++)
+                                                {
+                                                        uniqueSplits.add(splits[j]);
+                                                }
+                                        }
+                                        
+                                        
+                                }
+                                
+                                for(String split: uniqueSplits)
+                                {
+                                        out.print("<column token=\"" + split + "\" />");
+                                        log.info("<column token=\"" + split + "\" />");
+                                }
-                                
-                                out.print("</columns>");
@@ -128 +162 @@
-                                                                         log.info("<value>" + resByPat.getValue().get(i).toString() + "</value>");
-                                                                         
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                         
-                                                                         out.print("</row>");
@@ -153 +246 @@
-                                                                 log.info("<value>" + resByPat.getValue().toString() + "</value>");
-                                                                 
+                                                                 
+                                                                //add splitter values
+                                                                 for(String split: uniqueSplits)
+                                                                 {
+                                                                         if(split.equals(OBSERVATIONDATE))
+                                                                         {
+                                                                                 if(resByPat.getValue().getResultDate() != null)
+                                                                                 {
+                                                                                         out.print("<value>" + resByPat.getValue().getResultDate().getTime() + "</value>");
+                                                                                         log.info("<value>" + resByPat.getValue().getResultDate().getTime() + "</value>");
+                                                                                 }
+                                                                                 else
+                                                                                 {
+                                                                                         out.print("<value></value>");
+                                                                                         log.info("<value></value>");
+                                                                                 }
+                                                                         }
+                                                                         else if(split.equals(OBSERVATIONLOCATION))
+                                                                         {
+                                                                                 Obs obs = (Obs) resByPat.getValue().getResultObject();
+                                                                                 
+                                                                                 if(obs != null)
+                                                                                 {
+                                                                                         out.print("<value>" + obs.getLocation() + "</value>");
+                                                                                         log.info("<value>" + obs.getLocation() + "</value>");
+                                                                                 }
+                                                                                 else
+                                                                                 {
+                                                                                         out.print("<value></value>");
+                                                                                         log.info("<value></value>");
+                                                                                 }                                                                               
+                                                                         }      
+                                                                         else if(split.equals(ENCOUNTERDATE))
+                                                                         {
+                                                                                 Obs obs = (Obs) resByPat.getValue().getResultObject();
+                                                                                 
+                                                                                 if(obs != null)
+                                                                                 {
+                                                                                         out.print("<value>" + obs.getEncounter().getEncounterDatetime().getTime() + "</value>");
+                                                                                         log.info("<value>" + obs.getEncounter().getEncounterDatetime().getTime() + "</value>");
+                                                                                 }
+                                                                                 else
+                                                                                 {
+                                                                                         out.print("<value></value>");
+                                                                                         log.info("<value></value>");
+                                                                                 }                                                                               
+                                                                         }
+                                                                         else if(split.equals(ENCOUNTERTYPE))
+                                                                         {
+                                                                                 Obs obs = (Obs) resByPat.getValue().getResultObject();
+                                                                                 
+                                                                                 if(obs != null)
+                                                                                 {
+                                                                                         out.print("<value>" + obs.getEncounter().getEncounterType() + "</value>");
+                                                                                         log.info("<value>" + obs.getEncounter().getEncounterType() + "</value>");
+                                                                                 }
+                                                                                 else
+                                                                                 {
+                                                                                         out.print("<value></value>");
+                                                                                         log.info("<value></value>");
+                                                                                 }                                                                               
+                                                                         }
+                                                                 }
-                                                                 out.print("</row>");
-
-
-
-
-
-
+
+
+
-                                        }
-                                        
@@ -189 +342 @@
-                                                out.print("<column token=\"" + t + "_" + i + "\" />");          
-                                                log.info("<column token=\"" + t + "_" + i + "\" />");
+                                                
+                                                //add the split columns
+                                                String[] splits = dataQuery.getTokenSplits(t);
+                                                
+                                                if(splits != null)
+                                                {
+                                                        for(String split: splits)
+                                                        {
+                                                                out.print("<column token=\"" + t + "_" + i + "_" + split + "\" />");
+                                                                log.info("<column token=\"" + t + "_" + i + "_" + split + "\" />");
+                                                        }                                                       
+                                                }
+                                                
-                                        }
-                                        
@@ -230 +396 @@
-                                                {
-                                                        Result res = resultsForTokens.get(token).get(patient);
-
+       
-                                                        for(int i = 0; i < max; i++)
-                                                        {
-                                                                out.print("<value>" + res.get(i) + "</value>");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+