=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java 2009-12-18 08:47:45 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java 2009-12-18 08:56:52 +0000 @@ -107,9 +107,9 @@ public void write( XMLWriter writer, ExportParams params ) { Collection categoryCombos = categoryService.getDataElementCategoryCombos( params.getCategoryCombos() ); - System.out.println( "catcom size " + categoryCombos.size() ); + Collection categories = categoryService.getDataElementCategories( params.getCategories() ); - System.out.println( "cat size " + categories.size() ); + if ( categoryCombos != null && categoryCombos.size() > 0 && categories != null && categories.size() > 0 ) { writer.openElement( COLLECTION_NAME ); @@ -122,10 +122,8 @@ for ( DataElementCategory category : categoryCombo.getCategories() ) { - System.out.println( "cat name "+ category.getName() ); if ( categories.contains( category ) ) { - System.out.println( "contains"); writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_CATEGORY_COMBO, String.valueOf( categoryCombo.getId() ) );