=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 2009-11-02 11:56:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 2009-11-23 10:37:57 +0000 @@ -48,7 +48,6 @@ ORGANISATIONUNITGROUPSET, ORGANISATIONUNITRELATIONSHIP, REPORTTABLE_DATAELEMENT, - REPORTTABLE_CATEGORY_OPTION_COMBO, REPORTTABLE_INDICATOR, REPORTTABLE_DATASET, REPORTTABLE_PERIOD, === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2009-11-02 11:56:51 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2009-11-23 10:37:57 +0000 @@ -103,8 +103,6 @@ void importReportTableDataElements(); - void importReportTableCategoryOptionCombos(); - void importReportTableIndicators(); void importReportTableDataSets(); === removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableCategoryOptionComboConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableCategoryOptionComboConverter.java 2009-08-12 21:06:37 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableCategoryOptionComboConverter.java 1970-01-01 00:00:00 +0000 @@ -1,148 +0,0 @@ -package org.hisp.dhis.importexport.dxf.converter; - -/* - * Copyright (c) 2004-2007, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Collection; -import java.util.Map; - -import org.amplecode.quick.BatchHandler; -import org.amplecode.staxwax.reader.XMLReader; -import org.amplecode.staxwax.writer.XMLWriter; -import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; -import org.hisp.dhis.importexport.AssociationType; -import org.hisp.dhis.importexport.ExportParams; -import org.hisp.dhis.importexport.GroupMemberAssociation; -import org.hisp.dhis.importexport.GroupMemberType; -import org.hisp.dhis.importexport.ImportObjectService; -import org.hisp.dhis.importexport.ImportParams; -import org.hisp.dhis.importexport.XMLConverter; -import org.hisp.dhis.importexport.converter.AbstractGroupMemberConverter; -import org.hisp.dhis.reporttable.ReportTable; -import org.hisp.dhis.reporttable.ReportTableService; - -/** - * @author Lars Helge Overland - * @version $Id$ - */ -public class ReportTableCategoryOptionComboConverter - extends AbstractGroupMemberConverter implements XMLConverter -{ - public static final String COLLECTION_NAME = "reportTableCategoryOptionCombos"; - public static final String ELEMENT_NAME = "reportTableCategoryOptionCombo"; - - private static final String FIELD_REPORTTABLE = "reportTable"; - private static final String FIELD_CATEGORY_OPTION_COMBO = "categoryOptionCombo"; - private static final String FIELD_SORT_ORDER = "sortOrder"; - - // ------------------------------------------------------------------------- - // Properties - // ------------------------------------------------------------------------- - - private ReportTableService reportTableService; - - private Map reportTableMapping; - - private Map categoryOptionComboMapping; - - // ------------------------------------------------------------------------- - // Constructor - // ------------------------------------------------------------------------- - - /** - * Constructor for write operations. - */ - public ReportTableCategoryOptionComboConverter( ReportTableService reportTableService ) - { - this.reportTableService = reportTableService; - } - - /** - * Constructor for read operations. - */ - public ReportTableCategoryOptionComboConverter( BatchHandler batchHandler, - ImportObjectService importObjectService, - Map reportTableMapping, - Map categoryOptionComboMapping ) - { - this.batchHandler = batchHandler; - this.importObjectService = importObjectService; - this.reportTableMapping = reportTableMapping; - this.categoryOptionComboMapping = categoryOptionComboMapping; - } - - // ------------------------------------------------------------------------- - // XMLConverter implementation - // ------------------------------------------------------------------------- - - public void write( XMLWriter writer, ExportParams params ) - { - Collection reportTables = reportTableService.getReportTables( params.getReportTables() ); - - if ( reportTables != null && reportTables.size() > 0 ) - { - writer.openElement( COLLECTION_NAME ); - - for ( ReportTable reportTable : reportTables ) - { - if ( reportTable.getCategoryOptionCombos() != null ) - { - int sortOrder = 0; - - for ( DataElementCategoryOptionCombo categoryOptionCombo : reportTable.getCategoryOptionCombos() ) - { - writer.openElement( ELEMENT_NAME ); - - writer.writeElement( FIELD_REPORTTABLE, String.valueOf( reportTable.getId() ) ); - writer.writeElement( FIELD_CATEGORY_OPTION_COMBO, String.valueOf( categoryOptionCombo.getId() ) ); - writer.writeElement( FIELD_SORT_ORDER, String.valueOf( sortOrder++ ) ); - - writer.closeElement(); - } - } - } - - writer.closeElement(); - } - } - - public void read( XMLReader reader, ImportParams params ) - { - while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) ) - { - final Map values = reader.readElements( ELEMENT_NAME ); - - final GroupMemberAssociation association = new GroupMemberAssociation( AssociationType.LIST ); - - association.setGroupId( reportTableMapping.get( Integer.parseInt( values.get( FIELD_REPORTTABLE ) ) ) ); - association.setMemberId( categoryOptionComboMapping.get( Integer.parseInt( values.get( FIELD_CATEGORY_OPTION_COMBO ) ) ) ); - association.setSortOrder( Integer.parseInt( values.get( FIELD_SORT_ORDER ) ) ); - - read( association, GroupMemberType.REPORTTABLE_CATEGORY_OPTION_COMBO, params ); - } - } -} === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2009-11-01 21:32:55 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2009-11-23 10:37:57 +0000 @@ -86,7 +86,6 @@ import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitLevelConverter; import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitRelationshipConverter; import org.hisp.dhis.importexport.dxf.converter.PeriodConverter; -import org.hisp.dhis.importexport.dxf.converter.ReportTableCategoryOptionComboConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableDataElementConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableDataSetConverter; @@ -303,7 +302,6 @@ thread.registerXMLConverter( new ReportTableConverter( reportTableService ) ); thread.registerXMLConverter( new ReportTableDataElementConverter( reportTableService ) ); - thread.registerXMLConverter( new ReportTableCategoryOptionComboConverter( reportTableService ) ); thread.registerXMLConverter( new ReportTableIndicatorConverter( reportTableService ) ); thread.registerXMLConverter( new ReportTableDataSetConverter( reportTableService ) ); thread.registerXMLConverter( new ReportTablePeriodConverter( reportTableService ) ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java 2009-11-19 18:00:48 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java 2009-11-23 10:37:57 +0000 @@ -98,7 +98,6 @@ import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitLevelConverter; import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitRelationshipConverter; import org.hisp.dhis.importexport.dxf.converter.PeriodConverter; -import org.hisp.dhis.importexport.dxf.converter.ReportTableCategoryOptionComboConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableDataElementConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTableDataSetConverter; @@ -106,6 +105,7 @@ import org.hisp.dhis.importexport.dxf.converter.ReportTableOrganisationUnitConverter; import org.hisp.dhis.importexport.dxf.converter.ReportTablePeriodConverter; import org.hisp.dhis.importexport.dxf.converter.ValidationRuleConverter; +import org.hisp.dhis.importexport.dxf2.importer.Parser; import org.hisp.dhis.importexport.invoker.ConverterInvoker; import org.hisp.dhis.importexport.locking.LockingManager; import org.hisp.dhis.importexport.mapping.NameMappingUtil; @@ -148,7 +148,6 @@ import org.hisp.dhis.jdbc.batchhandler.OrganisationUnitGroupMemberBatchHandler; import org.hisp.dhis.jdbc.batchhandler.PeriodBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableBatchHandler; -import org.hisp.dhis.jdbc.batchhandler.ReportTableCategoryOptionComboBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableDataElementBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableDataSetBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableIndicatorBatchHandler; @@ -168,7 +167,6 @@ import org.hisp.dhis.source.Source; import org.hisp.dhis.system.util.StreamUtils; import org.hisp.dhis.validation.ValidationRuleService; -import org.hisp.dhis.importexport.dxf2.importer.Parser; /** * @author Lars Helge Overland @@ -1082,25 +1080,6 @@ log.info( "Imported ReportTable DataElements" ); } - else if ( reader.isStartElement( ReportTableCategoryOptionComboConverter.COLLECTION_NAME ) ) - { - // setMessage( "importing_report_table_category_option_combos" ); - - BatchHandler batchHandler = batchHandlerFactory - .createBatchHandler( ReportTableCategoryOptionComboBatchHandler.class ); - - batchHandler.init(); - - XMLConverter converter = new ReportTableCategoryOptionComboConverter( batchHandler, - importObjectService, objectMappingGenerator.getReportTableMapping( params.skipMapping() ), - objectMappingGenerator.getCategoryOptionComboMapping( params.skipMapping() ) ); - - converterInvoker.invokeRead( converter, reader, params ); - - batchHandler.flush(); - - log.info( "Imported ReportTable CategoryOptionCombos" ); - } else if ( reader.isStartElement( ReportTableIndicatorConverter.COLLECTION_NAME ) ) { // setMessage( "importing_report_table_indicators" ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2009-11-03 14:44:26 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2009-11-23 10:37:57 +0000 @@ -100,7 +100,6 @@ import org.hisp.dhis.jdbc.batchhandler.OrganisationUnitGroupMemberBatchHandler; import org.hisp.dhis.jdbc.batchhandler.PeriodBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableBatchHandler; -import org.hisp.dhis.jdbc.batchhandler.ReportTableCategoryOptionComboBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableDataElementBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableDataSetBatchHandler; import org.hisp.dhis.jdbc.batchhandler.ReportTableIndicatorBatchHandler; @@ -1214,18 +1213,6 @@ } @Transactional - public void importReportTableCategoryOptionCombos() - { - BatchHandler batchHandler = batchHandlerFactory.createBatchHandler( ReportTableCategoryOptionComboBatchHandler.class ); - - importGroupMemberAssociation( batchHandler, GroupMemberType.REPORTTABLE_CATEGORY_OPTION_COMBO, - objectMappingGenerator.getReportTableMapping( false ), - objectMappingGenerator.getCategoryOptionComboMapping( false ) ); - - log.info( "Imported ReportTable CategoryOptionCombos" ); - } - - @Transactional public void importReportTableIndicators() { BatchHandler batchHandler = batchHandlerFactory.createBatchHandler( ReportTableIndicatorBatchHandler.class ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2009-11-02 11:56:51 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2009-11-23 10:37:57 +0000 @@ -379,7 +379,6 @@ ReportTable reportTable = (ReportTable) importObject.getObject(); deleteGroupAssociations( GroupMemberType.REPORTTABLE_DATAELEMENT, reportTable.getId() ); - deleteGroupAssociations( GroupMemberType.REPORTTABLE_CATEGORY_OPTION_COMBO, reportTable.getId() ); deleteGroupAssociations( GroupMemberType.REPORTTABLE_INDICATOR, reportTable.getId() ); deleteGroupAssociations( GroupMemberType.REPORTTABLE_DATASET, reportTable.getId() ); deleteGroupAssociations( GroupMemberType.REPORTTABLE_PERIOD, reportTable.getId() ); @@ -487,7 +486,6 @@ else if ( clazz.equals( ReportTable.class ) ) { importObjectStore.deleteImportObjects( GroupMemberType.REPORTTABLE_DATAELEMENT ); - importObjectStore.deleteImportObjects( GroupMemberType.REPORTTABLE_CATEGORY_OPTION_COMBO ); importObjectStore.deleteImportObjects( GroupMemberType.REPORTTABLE_INDICATOR ); importObjectStore.deleteImportObjects( GroupMemberType.REPORTTABLE_DATASET ); importObjectStore.deleteImportObjects( GroupMemberType.REPORTTABLE_PERIOD ); @@ -667,7 +665,6 @@ importObjectManager.importPeriods(); importObjectManager.importReportTables(); importObjectManager.importReportTableDataElements(); - importObjectManager.importReportTableCategoryOptionCombos(); importObjectManager.importReportTableIndicators(); importObjectManager.importReportTableDataSets(); importObjectManager.importReportTablePeriods(); === removed file 'dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableCategoryOptionComboBatchHandler.java' --- dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableCategoryOptionComboBatchHandler.java 2009-08-12 21:06:37 +0000 +++ dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableCategoryOptionComboBatchHandler.java 1970-01-01 00:00:00 +0000 @@ -1,84 +0,0 @@ -package org.hisp.dhis.jdbc.batchhandler; - -/* - * Copyright (c) 2004-2007, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.amplecode.quick.JdbcConfiguration; -import org.amplecode.quick.batchhandler.AbstractBatchHandler; -import org.hisp.dhis.importexport.GroupMemberAssociation; - -/** - * @author Lars Helge Overland - * @version $Id$ - */ -public class ReportTableCategoryOptionComboBatchHandler - extends AbstractBatchHandler -{ - // ------------------------------------------------------------------------- - // Constructor - // ------------------------------------------------------------------------- - - public ReportTableCategoryOptionComboBatchHandler( JdbcConfiguration configuration ) - { - super( configuration, true, true ); - } - - // ------------------------------------------------------------------------- - // AbstractBatchHandler implementation - // ------------------------------------------------------------------------- - - protected void setTableName() - { - statementBuilder.setTableName( "reporttable_categoryoptioncombos" ); - } - - protected void setUniqueColumns() - { - statementBuilder.setUniqueColumn( "reporttableid" ); - statementBuilder.setUniqueColumn( "categoryoptioncomboid" ); - } - - protected void setUniqueValues( GroupMemberAssociation association ) - { - statementBuilder.setUniqueValue( association.getGroupId() ); - statementBuilder.setUniqueValue( association.getMemberId() ); - } - - protected void setColumns() - { - statementBuilder.setColumn( "reporttableid" ); - statementBuilder.setColumn( "categoryoptioncomboid" ); - statementBuilder.setColumn( "sort_order" ); - } - - protected void setValues( GroupMemberAssociation association ) - { - statementBuilder.setValue( association.getGroupId() ); - statementBuilder.setValue( association.getMemberId() ); - statementBuilder.setValue( association.getSortOrder() ); - } -}