OpenMRS

Timestamp:

05/19/08 23:47:49 (6 months ago)

Author:

bmckown

Message:

complex_obs branch: Added ability to override handlers via Spring. Added methods to update and purge ComplexData from the file system. Added support for multiple mime types in ImageHandler based on file name. Added temporary files complexObsList.jsp and complexObsForm.jsp

Files:

• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (21 diffs)

openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java

@@ -62 +62 @@
-         * Report handlers that have been registered.
-         * 
-
+
+
-         */
-        private static Map<String, ComplexObsHandler> handlers = null;
-
-
+
-        public ObsServiceImpl() {
-        }
@@ -78 +78 @@
-                if (!Context.hasPrivilege(OpenmrsConstants.PRIV_VIEW_OBS))
-                        throw new APIAuthenticationException("Privilege required: "
-               
+        
-
-                return dao;
@@ -99 +99 @@
-                }
-                setRequiredObsProperties(obs);
-
+
-                getObsDAO().createObs(obs);
-        }
-
+
-        /**
-         * Sets the creator and dateCreated properties on the Obs object
@@ -114 +114 @@
-                if (obs.getDateCreated() == null)
-                        obs.setDateCreated(new Date());
-
+
-                if (obs.getGroupMembers() != null) {
-                        for (Obs member : obs.getGroupMembers()) {
-                                // if statement does a quick sanity check to
-                                // avoid the simplest of infinite loops
- || 
-       
-       
+
+        || 
+
-                        }
-                }
@@ -129 +129 @@
-         * 
-         * Correct use case:
+         * 
-         * <pre>
-         * Obs parent = new Obs();
@@ -138 +139 @@
-         * </pre>
-         * 
-
-
+
+
+
-         * 
-         * @see org.openmrs.api.ObsService#createObsGroup(org.openmrs.Obs[])
@@ -146 +148 @@
-                if (obs == null || obs.length < 1)
-                        return; // silently tolerate calls with missing/empty parameter
-
-
-
-
-
+
+
+
+
-                // fail silently if a default obs group is not defined
-                if (conceptIdStr == null || conceptIdStr.length() == 0)
-                        return;
-
+
-                Integer conceptId = Integer.valueOf(conceptIdStr);
-
-
+
+
+
-                // if they defined a bad concept, bail
-                if (defaultObsGroupConcept == null)
-
-
-
-
+
+
+
+
+
-                Obs obsGroup = new Obs();
-                obsGroup.setConcept(defaultObsGroupConcept);
-
+
-                for (Obs member : obs) {
-    
-    
-
-    
+       
+       
+
+       
-        }
-
@@ -180 +183 @@
-                return getObsDAO().getObs(obsId);
-        }
-
+
-        /**
-         * @see org.openmrs.api.ObsService#getComplexObs(java.lang.Integer)
-         */
-
+, String view
-                Obs obs = getObsDAO().getObs(obsId);
-                if (obs.isComplex()) {
-
+, view
-                }
-                return obs;
-        }
+
+        /**
+         * @see org.openmrs.api.ObsService#getAllComplexObs()
+         */
+        public List<Obs> getAllComplexObs() throws APIException {
+                List<Obs> obs = getObsDAO().getAllComplexObs();
+                return obs;
+        }
+
+        /**
+         * @see org.openmrs.api.ObsService#getComplexData(java.lang.Integer)
+         */
+        public ComplexData getComplexData(Integer obsId, String view)
+                throws APIException {
+                return this.getComplexObs(obsId, view).getComplexData();
+        }
+
+        /**
+         * @see org.openmrs.api.ObsService#getComplexData(org.openmrs.Obs)
+         */
+        public ComplexData getComplexData(Obs obs, String view) throws APIException {
+                return this.getComplexObs(obs.getObsId(), view).getComplexData();
+        }
-        
-        /**
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        /**
-         * @see org.openmrs.api.ObsService#updateObs(org.openmrs.Obs)
-         */
-        public void updateObs(Obs obs) throws APIException {
+                if (obs.isComplex() && null != obs.getComplexData().getData()) {
+                        ComplexObsHandler handler = getHandler(obs);
+                        if (null != handler) {
+                                handler.saveObs(obs);
+                        }
+                }
-                if (obs.isVoided() && obs.getVoidedBy() == null)
-                        voidObs(obs, obs.getVoidReason());
@@ -226 +257 @@
-         * If the Obs argument is an obsGroup, all group members will be voided.
-         * 
-
+
+
-         * @param Obs obs the Obs to void
-         * @param String reason the void reason
-         * @throws APIException
-         */
-
+
-        public void voidObs(Obs obs, String reason) throws APIException {
-                Set<Obs> obsToVoid = new HashSet<Obs>();
@@ -258 +290 @@
-                if (null != handler) {
-                        handler.saveObs(obs);
-              
+
-                getObsDAO().updateObs(obs);
-        }
@@ -265 +297 @@
-         * Unvoids an Obs
-         * 
-
-with the same 
+ with the same
+
-         * 
-         * @see org.openmrs.api.ObsService#unvoidObs(org.openmrs.Obs)
@@ -303 +335 @@
-         */
-        public void deleteObs(Obs obs) throws APIException {
+                this.purgeComplexData(obs);
-                getObsDAO().deleteObs(obs);
-        }
-
+
-        /**
-         * @see org.openmrs.api.ObsService#getMimeTypes()
@@ -321 +354 @@
-
-        /**
-
+
+
-         */
-        public Set<Obs> getObservations(Person who, boolean includeVoided) {
@@ -328 +362 @@
-
-        /**
-
-
-
+
+
+
+
+
+
-                return getObsDAO().getObservations(c, loc, sort, personType);
-        }
-
-        /**
-
-
-
+
+
+
+
+
-                return getObsDAO().getObservations(who, question, includeVoided);
-        }
-
-        /**
-
+
+
-         */
-        public List<Obs> getLastNObservations(Integer n, Person who,
-               
+        
-                return getObsDAO().getLastNObservations(n, who, question);
-        }
-
-        /**
-
-
-
+
+
+
+
+
-                return getObsDAO().getObservations(question, sort, personType);
-        }
-
-
-
-
-
+
+
+
+
+
+
+
-                return getObsDAO().getObservationsAnsweredByConcept(answer, personType);
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        /**
@@ -386 +433 @@
-
-        /**
-
-
-
+
+
+
+
+
-                List<Obs> obs = new Vector<Obs>();
-.getPatientsByIdentifier(
-               
+
+                       .getPatientsByIdentifier(
-                        obs.addAll(getObsDAO().findObservations(p.getPersonId(),
-
+
+
-                }
-                try {
-                        Integer i = Integer.valueOf(search);
-                        if (i != null)
-
+
+
+
-                } catch (Exception e) {
-                }
@@ -406 +458 @@
-
-        /**
-
-
-
+
+
+
+
+
-                // todo: make this efficient, and add a sort option
-
@@ -428 +482 @@
-
-        /**
-
+
+
+
-         */
-        public List<Obs> getObservations(Person who, Aggregation aggregation,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return this.getObservations(concepts, fromDate, toDate, false);
-        }
-
-
-
-
-
+
+
+
+
+
+
+
-                return getObsDAO().getObservations(patients, concepts, fromDate, toDate);
-        }
-
-
-
-complex 
+
+
+ complex
+
-         * Obs.isComplexObs() is false or there is an error instantiating the
-
-
-
-
+
-         * 
-         * @param obs A complex Obs.
@@ -470 +535 @@
-        public ComplexObsHandler getHandler(Obs obs) {
-                if (obs.getConcept().isComplex()) {
-
-
-
+
+
+
+
+
+
-                }
-                return null;
-                
-                /*
-                String className = ((ConceptComplex) obs.getConcept()).getHandler();
-                ComplexObsHandler handler = null;
-                try {
-                        Class c = OpenmrsClassLoader.getInstance().loadClass(className);
-                        handler = (ComplexObsHandler)c.newInstance();
-                        //Class handlerClass = Class.forName(className);
-                        //handler = (ComplexObsHandler)className.getClass().newInstance();
-                        //handler = (ComplexObsHandler) handlerClass.newInstance();
-                } catch (ClassNotFoundException cnfe) {
-                        return null;
-                } catch (InstantiationException ie) {
-                        return null;
-                } catch (IllegalAccessException iae) {
-                        return null;
-                }
-                return handler;
-                */
-        }
-
@@ -507 +556 @@
-                }
-        }
-
+
-        public List<ComplexObsHandler> getComplexObsHandlers() {
-
-
+ 
+ 
-                return new ArrayList<ComplexObsHandler>(getHandlers().values());
-
-
-
+
+
-
-        /**
@@ -521 +569 @@
-        public ComplexObsHandler getHandler(String key) {
-                try {
-
-
+
+
+
-                        return handlers.get(key);
-                } catch (Exception ex) {
-
+
+
-                        return null;
-                }
-    
-
+       
+
-        /**
-         * ADDs handlers...doesn't replace them.
+         * 
-         * @see org.openmrs.api.ObsService#setHandlers(Map)
-         */
-
+
+
-                for (Map.Entry<String, ComplexObsHandler> entry : newHandlers.entrySet()) {
-                        registerHandler(entry.getKey(), entry.getValue());
-                }
-        }
-
+
-        /**
-         * @see org.openmrs.api.ObsService#getHandlers()
@@ -546 +598 @@
-                if (handlers == null)
-                        handlers = new LinkedHashMap<String, ComplexObsHandler>();
-
+
-                return handlers;
-        }
-
-        /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        /**
-         * @see org.openmrs.api.ObsService#registerHandler(java.lang.String)
-         */
-        @SuppressWarnings("unchecked")
-
+
+
-                try {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        /**
-         * @see org.openmrs.api.ObsService#removeHandler(java.lang.Class)