OpenMRS

Timestamp:

07/17/08 18:40:13 (4 months ago)

Author:

dthomas

Message:

formimportexport. Fixed Darius' fixes -- a HashSet just need to be a LinkedHashSet.

--dt

Files:

• openmrs-modules/formimportexport/metadata/config.xml (modified) (1 diff)
• openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/impl/FormImportExportServiceImpl.java (modified) (7 diffs)

openmrs-modules/formimportexport/metadata/config.xml

@@ -7 +7 @@
-        <id>formimportexport</id>
-        <name>Form Import Export</name>
-1
+2
-        <package>org.openmrs.module.@MODULE_ID@</package>
-        <author>Darius Jazayeri</author>

openmrs-modules/formimportexport/src/org/openmrs/module/formimportexport/impl/FormImportExportServiceImpl.java

@@ -12 +12 @@
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
@@ -18 +17 @@
-import java.util.Iterator;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
@@ -114 +114 @@
-            
-            List<Integer> toDo = new ArrayList<Integer>(map.keySet());
-
+Linked
-            while (toDo.size() > 0) {
+
-                int doneThisPass = 0;
-                for (Iterator<Integer> i = toDo.iterator(); i.hasNext(); ) {
-                    Integer thisId = i.next();
-                    Set<Integer> childrenOfThis = childrenByConcept.get(thisId);
-done.containsAll(childrenOfThis)
+checkSafeToAddChild(done, childrenOfThis, thisId) 
-                        i.remove();
-                        done.add(thisId);
@@ -128 +129 @@
-                if (doneThisPass == 0) {
-                    throw new RuntimeException("Unresolvable cycle in concept dictionary. The following concepts appear to be in cycles: " + toDo);
-
+ 
-            }
-            
@@ -251 +252 @@
-                        FormImportExportService service = (FormImportExportService) Context.getService(FormImportExportService.class);
-                        for (String conceptXml : toCreate) {
+                            log.info(toCreate);
-                                Concept concept = (Concept) conceptXstream.fromXML(conceptXml);
-
@@ -407 +409 @@
-                                        //if ( concept.getConceptId() == 3037 ) {
-                                                if (localConcept != null) {
-getDao()
+Context
-                                                    service.updateConcept(concept);
-                                                        sb.append("Updated " + concept.getConceptId() + ": " + localConcept.getName(Context.getLocale()) + " -> " + cn + "\n");
@@ -641 +643 @@
-        }
-
+        public boolean checkSafeToAddChild(Set<Integer> done, Set<Integer> childrenOfThis, Integer thisId){
+                    if (done.containsAll(childrenOfThis))
+                        return true;
+                    else {
+                        for (Integer i : childrenOfThis){
+                            if (!(done.contains(i) || thisId.equals(i)))
+                               return false;
+                        } 
+                        return true;
+                    }
+        }
+        
-        
-}