OpenMRS

Timestamp:

02/21/08 17:46:14 (11 months ago)

Author:

tmdugan

Message:

-- dss

* added a utility method to process a file directory name
* changed DssManager to store a HashMap of maxDssElements for a given dss type

Files:

• openmrs-modules/dss/metadata/config.xml (modified) (1 diff)
• openmrs-modules/dss/src/org/openmrs/module/dss/DssManager.java (modified) (4 diffs)
• openmrs-modules/dss/src/org/openmrs/module/dss/util/Util.java (modified) (1 diff)

openmrs-modules/dss/metadata/config.xml

@@ -7 +7 @@
-        <id>dss</id>
-        <name>Dss</name>
-5
+6
-        <package>org.openmrs.module.@MODULE_ID@</package>
-        <author>Vibha Anand and Tammy Dugan</author>

openmrs-modules/dss/src/org/openmrs/module/dss/DssManager.java

@@ -25 +25 @@
-        private HashMap<String,ArrayList<DssElement>> dssElementsByType = null;
-        private Patient patient = null;
+        private HashMap<String, Integer> maxDssElementsByType = null;
-
-        public DssManager(Patient patient)
@@ -31 +32 @@
-        }
-        
-int numDssElements,
+
-        {
-                if(this.dssElementsByType == null)
@@ -62 +63 @@
-                ArrayList<Rule> processedRules = null;
-                Result currResult = null;
-
+
+
-                AdministrationService adminService = Context.getAdministrationService();
-                final int BATCH_SIZE = Integer.parseInt(adminService
-                                .getGlobalProperty("dss.batchSizeRunRules"));
-
-num
+max
-                {
-                        ruleList = new ArrayList<Rule>();
@@ -129 +131 @@
-                return this.dssElementsByType;
-        }
+
+        public void setMaxDssElementsByType(String type, int maxDssElements)
+        {
+                if(this.maxDssElementsByType == null)
+                {
+                        this.maxDssElementsByType = new HashMap<String,Integer>();
+                }
+                
+                this.maxDssElementsByType.put(type, new Integer(maxDssElements));
+        }
+        
+        public int getMaxDssElementsByType(String type)
+        {
+                Integer lookup = null;
+                
+                if (this.maxDssElementsByType != null)
+                {
+                        lookup = this.maxDssElementsByType.get(type);
+                }
+                
+                if(lookup != null)
+                {
+                        return lookup.intValue();
+                }
+                return 0;
+        }
-}

openmrs-modules/dss/src/org/openmrs/module/dss/util/Util.java

@@ -298 +298 @@
-        }
-        
+        public static String processFileDirectory(String fileDirectory)
+        {
+                if(!(fileDirectory.endsWith("/")||fileDirectory.endsWith("\\")))
+                {
+                        fileDirectory+="/";
+                }
+                return fileDirectory;
+        }
+        
-        public static String processFileDirectoryGlobalProperty(String property)
-        {
-                AdministrationService adminService = Context.getAdministrationService();
-                String fileDirectory = adminService.getGlobalProperty(property);
-
-
-
-
-
+
-        }
-}