OpenMRS

Timestamp:

05/07/08 16:37:28 (8 months ago)

Author:

bmckown

Message:

complex_obs branch: Added sqldiff for new tables. Added image handler. Added JUnit test for image handler.

Files:

• openmrs/branches/complex_obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (3 diffs)

openmrs/branches/complex_obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java

@@ -39 +39 @@
-import org.openmrs.logic.Aggregation;
-import org.openmrs.logic.Constraint;
+import org.openmrs.obs.ComplexData;
+import org.openmrs.obs.ComplexObsHandler;
-import org.openmrs.reporting.PatientSet;
-import org.openmrs.util.OpenmrsConstants;
@@ -80 +82 @@
-         */
-        public void createObs(Obs obs) throws APIException {
+                ComplexObsHandler handler = ComplexData.getHandler(obs);
+                if (null != handler) {
+                        handler.saveObs(obs);
+                }
-                setRequiredObsProperties(obs);
-                
@@ -211 +217 @@
-                        o.setDateVoided(new Date());
-                }
+                // Handle complex obs.
+                ComplexObsHandler handler = ComplexData.getHandler(obs);
+                if (null != handler) {
+                        handler.saveObs(obs);
+                }               
-                getObsDAO().updateObs(obs);
-        }