OpenMRS

Timestamp:

02/22/08 15:04:38 (11 months ago)

Author:

tmdugan

Message:

-- atd

* made changes to accommodate changes made in dss 2.07

Files:

• openmrs-modules/atd/.classpath (modified) (1 diff)
• openmrs-modules/atd/lib-common/dss-2.06.jar (deleted)
• openmrs-modules/atd/lib-common/dss-2.07.jar (added)
• openmrs-modules/atd/metadata/config.xml (modified) (1 diff)
• openmrs-modules/atd/src/org/openmrs/module/atd/TeleformTranslator.java (modified) (4 diffs)
• openmrs-modules/atd/src/org/openmrs/module/atd/impl/ATDServiceImpl.java (modified) (9 diffs)
• openmrs-modules/atd/src/org/openmrs/module/atd/service/ATDService.java (modified) (2 diffs)

openmrs-modules/atd/.classpath

@@ -65 +65 @@
-        <classpathentry kind="lib" path="/dss/dist"/>
-        <classpathentry kind="lib" path="lib-common/openmrs-api-1.2.0.3328.jar" sourcepath="/openmrs_logic/src"/>
-6
+7
-        <classpathentry kind="output" path="build"/>
-</classpath>

openmrs-modules/atd/metadata/config.xml

@@ -7 +7 @@
-        <id>atd</id>
-        <name>ATD</name>
-09
+10
-        <package>org.openmrs.module.@MODULE_ID@</package>
-        <author>Tammy Dugan</author>

openmrs-modules/atd/src/org/openmrs/module/atd/TeleformTranslator.java

@@ -15 +15 @@
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.openmrs.Concept;
-import org.openmrs.Field;
-import org.openmrs.FieldType;
@@ -246 +247 @@
-                
-                int dssMergeCounter = 0;
+                String mode = "PRODUCE";
+
+                HashMap<String,Object> parameters = new HashMap<String,Object>();
+                
+                parameters.put("formInstanceId", formInstanceId);
+                
+                if(encounterId != null)
+                {
+                        parameters.put("encounterId", encounterId);
+                }
+                
+                parameters.put("mode", mode);
-                
-                while (iter.hasNext())
@@ -269 +282 @@
-                        if(currField.getFieldType().equals(atdMergeType))
-                        {
+                                Concept concept = currField.getConcept();
+                                if (concept != null)
+                                {
+                                        try
+                                        {
+                                                parameters.put("concept", concept.getName().getName());
+                                        } catch (Exception e)
+                                        {
+                                        }
+                                }else
+                                {
+                                        parameters.put("concept",null);
+                                }
-                                if (dssService.getRules(defaultValue).size()>0)
-                                {       
-                                        dssManager.populateDssElements(
-
+,parameters
-                                        result = processDssElements(dssManager, dssMergeCounter,
-                                                        currField.getFieldId(), 
@@ -280 +306 @@
-                                {
-                                        
-currField.getConcept(),
-formInstanceId,encounterId,patient,"PRODUCE",null
+
+patient,parameters
-                                }
-                                

openmrs-modules/atd/src/org/openmrs/module/atd/impl/ATDServiceImpl.java

@@ -189 +189 @@
-                        }
-                }
-
+
+
+
+
-                Set<FormField> fieldsWithValues = formFieldToValue.keySet();
-                Concept currConcept = null;
@@ -195 +198 @@
-                Iterator<String> valuesIter = null;
-                Obs obs = null;
-
-
+
+
+
+
+
+
-                
-                // merge list of values into single value based on concept type
@@ -206 +213 @@
-                        String defaultValue = currField.getField().getDefaultValue();
-                        
+                        if (currConcept != null)
+                        {
+                                try
+                                {
+                                        parameters.put("concept", currConcept.getName());
+                                } catch (Exception e)
+                                {
+                                }
+                        }else
+                        {
+                                parameters.put("concept", null);
+                        }
+                        
+                        String fieldName = currField.getField().getName();
+                        if(fieldName != null)
+                        {
+                                parameters.put("fieldName", fieldName);
+                        }
-                        values = formFieldToValue.get(currField);
-                        
@@ -235 +260 @@
-                        if (defaultValue != null)
-                        {
-
-
-
+
-                                continue;
-                        }
@@ -410 +433 @@
-        }
-
-
-
-
-
-
+
+
-        {
-                DssService dssService = (DssService) Context.getService(DssService.class);
@@ -421 +441 @@
-                        new StringTokenizer(ruleEvalString,">");
-                ArrayList<String> ruleTokens = new ArrayList<String>();
+                HashMap<String, Object> parameters = null;
-                
-                while(tokenizer.hasMoreTokens())
@@ -426 +447 @@
-                        ruleTokens.add(tokenizer.nextToken().trim());
-                }
-
-Map<String, Object> parameters = new HashMap<String, Object>(
-
+parameters = new HashMap<String, Object>();
+parameters.putAll(baseParameters
+       
-                for (String ruleToken : ruleTokens)
-                {
-                        
-                        if(ruleToken.contains("\""))
-                        {
-                                parameters = new HashMap<String, Object>();
-                                tokenizer  = new StringTokenizer(ruleToken.substring(1,ruleToken.length()-1),",");
-                                int position = 0;
@@ -446 +465 @@
-                        
-                        Rule rule = new Rule();
-                        
-                        if (concept != null)
-                        {
-                                try
-                                {
-                                        parameters.put("concept", concept.getName().getName());
-                                } catch (Exception e)
-                                {
-                                }
-                        }
-                        
-                        if(formInstanceId != null)
-                        {
-                                parameters.put("formInstanceId", formInstanceId);
-                        }
-                        
-                        if(encounterId != null)
-                        {
-                                parameters.put("encounterId", encounterId);
-                        }
-                        
-                        if(mode != null)
-                        {
-                                parameters.put("mode", mode);
-                        }
-                        
-                        if(fieldName != null)
-                        {
-                                parameters.put("fieldName", fieldName);
-                        }
-                        
-                        rule.setShortName(ruleToken);
@@ -483 +472 @@
-                                dssService.runRule(patient, rule, logicService);
-                        parameters = new HashMap<String, Object>();
+                        parameters.putAll(baseParameters);
-                        
-                        if (result != null)

openmrs-modules/atd/src/org/openmrs/module/atd/service/ATDService.java

@@ -3 +3 @@
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.util.HashMap;
-
-import org.openmrs.Concept;
@@ -48 +49 @@
-        public FormInstance addFormInstance(Integer formId);
-        
-
-
-
-
-
+
+
-        
-        public void addPatientATD(int patientId, Integer formId, DssElement dssElement,