dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2590
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-01-17 12:53:20 +0100
message:
  Fixed bug in report table import
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataEntryFormConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataEntryFormConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataEntryFormConverter.java	2011-01-17 11:14:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataEntryFormConverter.java	2011-01-17 11:53:20 +0000
@@ -153,8 +153,6 @@
         StringBuffer buffer = new StringBuffer();
 
         Matcher matcher = ID_PATTERN.matcher( htmlCode );
-        log.warn( "DE map"  + dataElementMapping );
-        log.warn( "COC map " + categoryOptionComboMapping );
         
         while ( matcher.find() )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java	2011-01-06 15:40:07 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java	2011-01-17 11:53:20 +0000
@@ -351,9 +351,6 @@
             {
                 reader.moveToStartElement( FIELD_REPORTING_MONTH );          
                 reportTable.getRelatives().setReportingMonth( Boolean.parseBoolean( reader.getElementValue() ) );
-    
-                reader.moveToStartElement( FIELD_REPORTING_MONTH );          
-                reportTable.getRelatives().setReportingMonth( Boolean.parseBoolean( reader.getElementValue() ) );
                 
                 reader.moveToStartElement( FIELD_MONTHS_THIS_YEAR );
                 reportTable.getRelatives().setMonthsThisYear( Boolean.parseBoolean( reader.getElementValue() ) );