OpenMRS

Timestamp:

07/11/08 13:48:21 (4 months ago)

Author:

catullus

Message:

data_sync_bidrectional: hacky fix to data export for constructs

Files:

• openmrs/branches/data_synchronization_bidirectional/metadata/api/log4j/log4j.xml (modified) (1 diff)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/ConceptColumn.java (modified) (8 diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportReportObject.java (modified) (1 diff)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportUtil.java (modified) (1 diff)

openmrs/branches/data_synchronization_bidirectional/metadata/api/log4j/log4j.xml

@@ -171 +171 @@
-        </logger>
-        
+        <logger name="org.openmrs.reporting.export.DataExportUtil">
+                <level value="DEBUG" />
+        </logger>
+        
-        <root>
-                <level value="WARN" />

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/ConceptColumn.java

@@ -15 +15 @@
-
-import java.io.Serializable;
-
+
+
+
-import org.openmrs.api.APIException;
+import org.openmrs.api.context.Context;
-
-public class ConceptColumn implements ExportColumn, Serializable {
@@ -45 +48 @@
-        }
-        
-ublic String toTemplateString() 
+rivate String toSingleTemplateString(int conceptId)
-                String s = "";
-                if (extras == null)
@@ -63 +66 @@
-                        
-                        if (DataExportReportObject.MODIFIER_LAST_NUM.equals(modifier))
-getConceptIdOrName()
+conceptId
-                        else if (DataExportReportObject.MODIFIER_FIRST_NUM.equals(modifier))
-getConceptIdOrName()
+conceptId
-                        s += "#foreach($vals in $obsValues)";
-                        s += "#if($velocityCount > 1)";
@@ -104 +107 @@
-                                s += "])";
-                                        
-getConceptIdOrName()
+conceptId
-                                
-                                s += "#set($obsRow =" + function + ")"; 
@@ -118 +121 @@
-                return s;
-        }
+        
+        public String toTemplateString() {
+                Concept concept = Context.getConceptService().getConcept(conceptId);
+                String toReturn;
+                
+                if(!concept.isSet()){
+                        toReturn = toSingleTemplateString(concept.getConceptId());
+                }else{
+                        List<Concept> setMembers = Context.getConceptService().getConceptsInSet(concept);
+                        toReturn = "";
+                        boolean firstMember = true;
+                        for(Concept setMember : setMembers){
+                                if(firstMember){
+                                        toReturn+=toSingleTemplateString(setMember.getConceptId());
+                                        firstMember=false;
+                                }else{
+                                        toReturn+="$!{fn.getSeparator()}";
+                                        toReturn+=toSingleTemplateString(setMember.getConceptId());
+                                }
+                        }
+                }
+                
+                return toReturn;
+                
+        }
-
-        public String getColumnType() {
@@ -131 +159 @@
-        }
-        
-ublic String getTemplateColumnName() 
-columnName
-
+rivate String getTemplateSingleConceptColumnName(String conceptName)
+"\"" + conceptName + "\""
+conceptName, 
-                
-                if (DataExportReportObject.MODIFIER_LAST_NUM.equals(modifier) || 
@@ -143 +171 @@
-                                s += "#foreach($o in [1.." + (modifierNum - 1) +"]) ";
-                        s += "$!{fn.getSeparator()}";
-
-
+
+
+
+
-                        s += "#end\n";
-                }
@@ -151 +181 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                String s = "";
-                if (extras != null) {
-                        for (String ext : extras) {
-                                s += "$!{fn.getSeparator()}";
-
+
+
+
-                                if (appendCount)
-                                        s += "_($velocityCount)";

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportReportObject.java

@@ -23 +23 @@
-import org.apache.commons.logging.LogFactory;
-import org.openmrs.Cohort;
+import org.openmrs.Concept;
-import org.openmrs.Location;
-import org.openmrs.api.PatientSetService;

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportUtil.java

@@ -124 +124 @@
-                
-                if (log.isDebugEnabled())
-.substring(0, template.length() < 3500 ? template.length() : 3500) + "..."
+
-                
-                try {