dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4556
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2011-09-09 17:30:37 +0100
message:
  Fixed bug related to dxfv1 namespace.  Default should be to consider dxf without namespace (eg legacy) as dxfv1.  We don't need the namespace declaration to tell us this.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.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/DefaultImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java	2011-09-09 11:20:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java	2011-09-09 16:30:37 +0000
@@ -192,13 +192,11 @@
 
             if (rootNameSpace.equals( DXF2URI )) {
               log.debug( "Sending DXFv2 to converter" );
-              converter.read( dxfReader, params, state );
-            } else if (rootNameSpace.equals( DXF1URI )) {
+              dxf2converter.read( dxfReader, params, state );
+            } else  {
               log.debug( "Sending DXFv1 to converter" );
               converter.read( dxfReader, params, state );
-            } else {
-                throw new ImportException("Unknown dxf version: " + rootNameSpace);
-            }
+            } 
         }
         catch ( IOException ex )
         {