Navigation

← Previous Change
Next Change →

MostRecentDataStyle.java

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/MostRecentDataStyle.java (modified) (11 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

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

r5144	r5220
39	39	public class MostRecentDataStyle {
40	40
	41	private static final String END_VALUE_TAG = "</value>";
	42
	43	private static final String START_VALUE_TAG = "<value>";
	44
41	45	private static Log log = LogFactory.getLog(MostRecentDataStyle.class
42	46	.getName());
…	…
139	143
140	144	// always print the patient id first
141		out.print(~~"<value>" + patient + "</value>"~~);
142		log.info(~~"<value>" + patient + "</value>"~~);
	145	out.print(START_VALUE_TAG + patient + END_VALUE_TAG);
	146	log.info(START_VALUE_TAG + patient + END_VALUE_TAG);
143	147
144	148	for (LogicCriteria token : tokens) {
…	…
146	150
147	151	if (res.size() > 0) {
148		out.print("<value>" + res.get(0) + "</value>");
149		log.info("<value>" + res.get(0) + "</value>");
	152	out.print(START_VALUE_TAG + res.get(0)
	153	+ END_VALUE_TAG);
	154	log.info(START_VALUE_TAG + res.get(0)
	155	+ END_VALUE_TAG);
150	156
151	157	String[] splits = dataQuery.getTokenSplits(token
…	…
156	162	if (split.equals(OBSERVATIONDATE)) {
157	163	if (res.get(0).getResultDate() != null) {
158		out.print(~~"<value>"~~
	164	out.print(START_VALUE_TAG
159	165	+ res.get(0)
160	166	.getResultDate()
161	167	.getTime()
162		+ ~~"</value>"~~);
163		log.info(~~"<value>"~~
	168	+ END_VALUE_TAG);
	169	log.info(START_VALUE_TAG
164	170	+ res.get(0)
165	171	.getResultDate()
166	172	.getTime()
167		+ "</value>");
168		} else {
169		out.print("<value></value>");
170		log.info("<value></value>");
	173	+ END_VALUE_TAG);
	174	} else {
	175	out.print(START_VALUE_TAG
	176	+ END_VALUE_TAG);
	177	log.info(START_VALUE_TAG
	178	+ END_VALUE_TAG);
171	179	}
172	180
…	…
176	184	.getResultObject();
177	185	if (obs != null) {
178		out.print(~~"<value>"~~
	186	out.print(START_VALUE_TAG
179	187	+ obs.getLocation()
180		+ ~~"</value>"~~);
181		log.info(~~"<value>"~~
	188	+ END_VALUE_TAG);
	189	log.info(START_VALUE_TAG
182	190	+ obs.getLocation()
183		+ "</value>");
184		} else {
185		out.print("<value></value>");
186		log.info("<value></value>");
	191	+ END_VALUE_TAG);
	192	} else {
	193	out.print(START_VALUE_TAG
	194	+ END_VALUE_TAG);
	195	log.info(START_VALUE_TAG
	196	+ END_VALUE_TAG);
187	197	}
188	198	} else if (split.equals(ENCOUNTERDATE)) {
…	…
191	201	if (obs != null) {
192	202	out
193		.print(~~"<value>"~~
	203	.print(START_VALUE_TAG
194	204	+ obs
195	205	.getEncounter()
196	206	.getEncounterDatetime()
197	207	.getTime()
198		+ ~~"</value>"~~);
	208	+ END_VALUE_TAG);
199	209	log
200		.info(~~"<value>"~~
	210	.info(START_VALUE_TAG
201	211	+ obs
202	212	.getEncounter()
203	213	.getEncounterDatetime()
204	214	.getTime()
205		+ "</value>");
206		} else {
207		out.print("<value></value>");
208		log.info("<value></value>");
	215	+ END_VALUE_TAG);
	216	} else {
	217	out.print(START_VALUE_TAG
	218	+ END_VALUE_TAG);
	219	log.info(START_VALUE_TAG
	220	+ END_VALUE_TAG);
209	221	}
210	222	} else if (split.equals(ENCOUNTERTYPE)) {
…	…
212	224	.getResultObject();
213	225	if (obs != null) {
214		out.print(~~"<value>"~~
	226	out.print(START_VALUE_TAG
215	227	+ obs.getEncounter()
216	228	.getEncounterType()
217		+ ~~"</value>"~~);
218		log.info(~~"<value>"~~
	229	+ END_VALUE_TAG);
	230	log.info(START_VALUE_TAG
219	231	+ obs.getEncounter()
220	232	.getEncounterType()
221		+ "</value>");
222		} else {
223		out.print("<value></value>");
224		log.info("<value></value>");
	233	+ END_VALUE_TAG);
	234	} else {
	235	out.print(START_VALUE_TAG
	236	+ END_VALUE_TAG);
	237	log.info(START_VALUE_TAG
	238	+ END_VALUE_TAG);
225	239	}
226	240	}
…	…
230	244
231	245	else {
232		out.print(~~"<value>" + res + "</value>"~~);
233		log.info(~~"<value>" + res + "</value>"~~);
	246	out.print(START_VALUE_TAG + res + END_VALUE_TAG);
	247	log.info(START_VALUE_TAG + res + END_VALUE_TAG);
234	248
235	249	String[] splits = dataQuery.getTokenSplits(token
…	…
240	254	if (split.equals(OBSERVATIONDATE)) {
241	255	if (res.getResultDate() != null) {
242		out.print(~~"<value>"~~
	256	out.print(START_VALUE_TAG
243	257	+ res.getResultDate()
244	258	.getTime()
245		+ ~~"</value>"~~);
246		log.info(~~"<value>"~~
	259	+ END_VALUE_TAG);
	260	log.info(START_VALUE_TAG
247	261	+ res.getResultDate()
248	262	.getTime()
249		+ ~~"</value>"~~);
	263	+ END_VALUE_TAG);
250	264	} else {
251	265	out.print("<value></value>");
…	…
257	271	Obs obs = (Obs) res.getResultObject();
258	272	if (obs != null) {
259		out.print(~~"<value>"~~
	273	out.print(START_VALUE_TAG
260	274	+ obs.getLocation()
261		+ ~~"</value>"~~);
262		log.info(~~"<value>"~~
	275	+ END_VALUE_TAG);
	276	log.info(START_VALUE_TAG
263	277	+ obs.getLocation()
264		+ "</value>");
265		} else {
266		out.print("<value></value>");
267		log.info("<value></value>");
	278	+ END_VALUE_TAG);
	279	} else {
	280	out.print(START_VALUE_TAG
	281	+ END_VALUE_TAG);
	282	log.info(START_VALUE_TAG
	283	+ END_VALUE_TAG);
268	284	}
269	285	} else if (split.equals(ENCOUNTERDATE)) {
…	…
271	287	if (obs != null) {
272	288	out
273		.print(~~"<value>"~~
	289	.print(START_VALUE_TAG
274	290	+ obs
275	291	.getEncounter()
276	292	.getEncounterDatetime()
277	293	.getTime()
278		+ ~~"</value>"~~);
	294	+ END_VALUE_TAG);
279	295	log
280		.info(~~"<value>"~~
	296	.info(START_VALUE_TAG
281	297	+ obs
282	298	.getEncounter()
283	299	.getEncounterDatetime()
284	300	.getTime()
285		+ "</value>");
286		} else {
287		out.print("<value></value>");
288		log.info("<value></value>");
	301	+ END_VALUE_TAG);
	302	} else {
	303	out.print(START_VALUE_TAG
	304	+ END_VALUE_TAG);
	305	log.info(START_VALUE_TAG
	306	+ END_VALUE_TAG);
289	307	}
290	308	} else if (split.equals(ENCOUNTERTYPE)) {
291	309	Obs obs = (Obs) res.getResultObject();
292	310	if (obs != null) {
293		out.print(~~"<value>"~~
	311	out.print(START_VALUE_TAG
294	312	+ obs.getEncounter()
295	313	.getEncounterType()
296		+ ~~"</value>"~~);
297		log.info(~~"<value>"~~
	314	+ END_VALUE_TAG);
	315	log.info(START_VALUE_TAG
298	316	+ obs.getEncounter()
299	317	.getEncounterType()
300		+ "</value>");
301		} else {
302		out.print("<value></value>");
303		log.info("<value></value>");
	318	+ END_VALUE_TAG);
	319	} else {
	320	out.print(START_VALUE_TAG
	321	+ END_VALUE_TAG);
	322	log.info(START_VALUE_TAG
	323	+ END_VALUE_TAG);
304	324	}
305	325	}

OpenMRS

Navigation

Changeset 5220 for openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/MostRecentDataStyle.java

Legend:

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

Download in other formats: