OpenMRS

Timestamp:

08/14/08 21:19:41 (5 months ago)

Author:

kevjay

Message:

logicws: Fixed bug where Obs cannot be extracted for some token Results.

Files:

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

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

@@ -92 +92 @@
-            log.info("<column token=\"PATIENTID\" />");
-
-
-
-
+
-                int max = Integer.parseInt(dataQuery.getTokenAggregateValue(t));
-
+
-                for (int i = 1; i < max + 1; i++) {
-                    out.print("<column token=\"" + t + "_" + i + "\" />");
@@ -152 +150 @@
-                        Result res = resultsForTokens.get(token).get(patient);
-
-
-
-
-
-
+
+
+
-                        for (int i = 0; i < max; i++) {
-                            out.print(START_VALUE_TAG + res.get(i)
@@ -190 +186 @@
-                                    } else if (split
-                                            .equals(OBSERVATIONLOCATION)) {
-
-
+
+
+
+
+
+
+
+
-                                        if (obs != null) {
-                                            out.print(START_VALUE_TAG
@@ -206 +208 @@
-                                        }
-                                    } else if (split.equals(ENCOUNTERDATE)) {
-
-
+
+
+
+
+
+
-                                        if (obs != null) {
-                                            out
@@ -230 +236 @@
-                                        }
-                                    } else if (split.equals(ENCOUNTERTYPE)) {
-
-
+
+
+
+
+
+
-                                        if (obs != null) {
-                                            out.print(START_VALUE_TAG