Changeset 5220 for openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/StackedDataStyle.java
- Timestamp:
- 08/10/08 18:37:29 (5 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openmrs-modules/logicws/web/src/org/openmrs/module/logicws/web/StackedDataStyle.java
r5144 r5220 40 40 public class StackedDataStyle { 41 41 42 private static final String END_VALUE_TAG = "</value>"; 43 44 private static final String START_VALUE_TAG = "<value>"; 45 42 46 private static Log log = LogFactory 43 47 .getLog(StackedDataStyle.class.getName()); … … 148 152 149 153 // always print the patient id first 150 out.print( "<value>"+ resByPat.getKey()151 + "</value>");152 log.info( "<value>"+ resByPat.getKey()153 + "</value>");154 out.print(START_VALUE_TAG + resByPat.getKey() 155 + END_VALUE_TAG); 156 log.info(START_VALUE_TAG + resByPat.getKey() 157 + END_VALUE_TAG); 154 158 155 159 // resByCrit.getValue().get(i).getResultObject().toString(); 156 160 157 out.print( "<value>"161 out.print(START_VALUE_TAG 158 162 + resByCrit.getKey().getRootToken() 159 + "</value>");160 log.info( "<value>"163 + END_VALUE_TAG); 164 log.info(START_VALUE_TAG 161 165 + resByCrit.getKey().getRootToken() 162 + "</value>");163 164 out.print( "<value>"166 + END_VALUE_TAG); 167 168 out.print(START_VALUE_TAG 165 169 + resByPat.getValue().get(i).toString() 166 + "</value>");167 log.info( "<value>"170 + END_VALUE_TAG); 171 log.info(START_VALUE_TAG 168 172 + resByPat.getValue().get(i).toString() 169 + "</value>");173 + END_VALUE_TAG); 170 174 171 175 // add splitter values … … 174 178 if (resByPat.getValue().get(i) 175 179 .getResultDate() != null) { 176 out.print( "<value>"180 out.print(START_VALUE_TAG 177 181 + resByPat.getValue() 178 182 .get(i) 179 183 .getResultDate() 180 184 .getTime() 181 + "</value>");182 log.info( "<value>"185 + END_VALUE_TAG); 186 log.info(START_VALUE_TAG 183 187 + resByPat.getValue() 184 188 .get(i) 185 189 .getResultDate() 186 190 .getTime() 187 + "</value>");191 + END_VALUE_TAG); 188 192 } else { 189 out.print("<value></value>"); 190 log.info("<value></value>"); 193 out.print(START_VALUE_TAG 194 + END_VALUE_TAG); 195 log.info(START_VALUE_TAG 196 + END_VALUE_TAG); 191 197 } 192 198 … … 197 203 198 204 if (obs != null) { 199 out.print( "<value>"205 out.print(START_VALUE_TAG 200 206 + obs.getLocation() 201 + "</value>");202 log.info( "<value>"207 + END_VALUE_TAG); 208 log.info(START_VALUE_TAG 203 209 + obs.getLocation() 204 + "</value>");210 + END_VALUE_TAG); 205 211 } else { 206 out.print("<value></value>"); 207 log.info("<value></value>"); 212 out.print(START_VALUE_TAG 213 + END_VALUE_TAG); 214 log.info(START_VALUE_TAG 215 + END_VALUE_TAG); 208 216 } 209 217 } else if (split.equals(ENCOUNTERDATE)) { … … 213 221 if (obs != null) { 214 222 out 215 .print( "<value>"223 .print(START_VALUE_TAG 216 224 + obs 217 225 .getEncounter() 218 226 .getEncounterDatetime() 219 227 .getTime() 220 + "</value>");228 + END_VALUE_TAG); 221 229 log 222 .info( "<value>"230 .info(START_VALUE_TAG 223 231 + obs 224 232 .getEncounter() 225 233 .getEncounterDatetime() 226 234 .getTime() 227 + "</value>");235 + END_VALUE_TAG); 228 236 } else { 229 out.print("<value></value>"); 230 log.info("<value></value>"); 237 out.print(START_VALUE_TAG 238 + END_VALUE_TAG); 239 log.info(START_VALUE_TAG 240 + END_VALUE_TAG); 231 241 } 232 242 } else if (split.equals(ENCOUNTERTYPE)) { … … 235 245 236 246 if (obs != null) { 237 out.print( "<value>"247 out.print(START_VALUE_TAG 238 248 + obs.getEncounter() 239 249 .getEncounterType() 240 + "</value>");241 log.info( "<value>"250 + END_VALUE_TAG); 251 log.info(START_VALUE_TAG 242 252 + obs.getEncounter() 243 253 .getEncounterType() 244 + "</value>");254 + END_VALUE_TAG); 245 255 } else { 246 out.print("<value></value>"); 247 log.info("<value></value>"); 256 out.print(START_VALUE_TAG 257 + END_VALUE_TAG); 258 log.info(START_VALUE_TAG 259 + END_VALUE_TAG); 248 260 } 249 261 } … … 258 270 259 271 // always print the patient id first 260 out.print("<value>" + resByPat.getKey() 261 + "</value>"); 262 log 263 .info("<value>" + resByPat.getKey() 264 + "</value>"); 265 266 out.print("<value>" 272 out.print(START_VALUE_TAG + resByPat.getKey() 273 + END_VALUE_TAG); 274 log.info(START_VALUE_TAG + resByPat.getKey() 275 + END_VALUE_TAG); 276 277 out.print(START_VALUE_TAG 267 278 + resByCrit.getKey().getRootToken() 268 + "</value>");269 log.info( "<value>"279 + END_VALUE_TAG); 280 log.info(START_VALUE_TAG 270 281 + resByCrit.getKey().getRootToken() 271 + "</value>");272 273 out.print( "<value>"282 + END_VALUE_TAG); 283 284 out.print(START_VALUE_TAG 274 285 + resByPat.getValue().toString() 275 + "</value>"); 276 log.info("<value>" + resByPat.getValue().toString() 277 + "</value>"); 286 + END_VALUE_TAG); 287 log.info(START_VALUE_TAG 288 + resByPat.getValue().toString() 289 + END_VALUE_TAG); 278 290 279 291 // add splitter values … … 281 293 if (split.equals(OBSERVATIONDATE)) { 282 294 if (resByPat.getValue().getResultDate() != null) { 283 out 284 .print("<value>" 285 + resByPat 286 .getValue() 287 .getResultDate() 288 .getTime() 289 + "</value>"); 290 log 291 .info("<value>" 292 + resByPat 293 .getValue() 294 .getResultDate() 295 .getTime() 296 + "</value>"); 295 out.print(START_VALUE_TAG 296 + resByPat.getValue() 297 .getResultDate() 298 .getTime() 299 + END_VALUE_TAG); 300 log.info(START_VALUE_TAG 301 + resByPat.getValue() 302 .getResultDate() 303 .getTime() 304 + END_VALUE_TAG); 297 305 } else { 298 out.print("<value></value>"); 299 log.info("<value></value>"); 306 out.print(START_VALUE_TAG 307 + END_VALUE_TAG); 308 log.info(START_VALUE_TAG 309 + END_VALUE_TAG); 300 310 } 301 311 } else if (split.equals(OBSERVATIONLOCATION)) { … … 304 314 305 315 if (obs != null) { 306 out.print("<value>" + obs.getLocation() 307 + "</value>"); 308 log.info("<value>" + obs.getLocation() 309 + "</value>"); 316 out.print(START_VALUE_TAG 317 + obs.getLocation() 318 + END_VALUE_TAG); 319 log.info(START_VALUE_TAG 320 + obs.getLocation() 321 + END_VALUE_TAG); 310 322 } else { 311 out.print("<value></value>"); 312 log.info("<value></value>"); 323 out.print(START_VALUE_TAG 324 + END_VALUE_TAG); 325 log.info(START_VALUE_TAG 326 + END_VALUE_TAG); 313 327 } 314 328 } else if (split.equals(ENCOUNTERDATE)) { … … 317 331 318 332 if (obs != null) { 319 out 320 .print("<value>" 321 + obs 322 .getEncounter() 323 .getEncounterDatetime() 324 .getTime() 325 + "</value>"); 326 log 327 .info("<value>" 328 + obs 329 .getEncounter() 330 .getEncounterDatetime() 331 .getTime() 332 + "</value>"); 333 out.print(START_VALUE_TAG 334 + obs.getEncounter() 335 .getEncounterDatetime() 336 .getTime() 337 + END_VALUE_TAG); 338 log.info(START_VALUE_TAG 339 + obs.getEncounter() 340 .getEncounterDatetime() 341 .getTime() 342 + END_VALUE_TAG); 333 343 } else { 334 out.print("<value></value>"); 335 log.info("<value></value>"); 344 out.print(START_VALUE_TAG 345 + END_VALUE_TAG); 346 log.info(START_VALUE_TAG 347 + END_VALUE_TAG); 336 348 } 337 349 } else if (split.equals(ENCOUNTERTYPE)) { … … 340 352 341 353 if (obs != null) { 342 out.print( "<value>"354 out.print(START_VALUE_TAG 343 355 + obs.getEncounter() 344 356 .getEncounterType() 345 + "</value>");346 log.info( "<value>"357 + END_VALUE_TAG); 358 log.info(START_VALUE_TAG 347 359 + obs.getEncounter() 348 360 .getEncounterType() 349 + "</value>");361 + END_VALUE_TAG); 350 362 } else { 351 out.print("<value></value>"); 352 log.info("<value></value>"); 363 out.print(START_VALUE_TAG 364 + END_VALUE_TAG); 365 log.info(START_VALUE_TAG 366 + END_VALUE_TAG); 353 367 } 354 368 }