Nice. I just updated the actual dxf schema in docs to reflect these changes.
Bob. 2009/10/31 <[email protected]> > ------------------------------------------------------------ > revno: 944 > committer: Lars Helge Oeverland [email protected] > branch nick: trunk > timestamp: Sat 2009-10-31 02:31:57 +0100 > message: > Changed dxf schema for DataValues, which are now written with attributes > rather than elements. Effectively cuts the file size in half. > modified: > > > dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java > > > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java > > > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java > > > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java > > > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java > > > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataValueConverter.java > > > 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/V2Parser.java > > > dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java > dhis-2/dhis-support/dhis-support-test/src/main/resources/log4j.properties > > > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm > dhis-2/pom.xml > > > -- > lp:dhis2 > https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk<https://code.launchpad.net/%7Edhis2-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<https://code.launchpad.net/%7Edhis2-devs-core/dhis2/trunk/+edit-subscription> > . > > === modified file > 'dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java' > --- > dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java > 2009-06-10 22:25:07 +0000 > +++ > dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java > 2009-10-31 01:31:57 +0000 > @@ -39,6 +39,7 @@ > import org.hisp.dhis.i18n.locale.LocaleManager; > import org.hisp.dhis.organisationunit.OrganisationUnit; > import org.junit.Before; > +import org.junit.Ignore; > import org.junit.Test; > > import static junit.framework.Assert.*; > @@ -83,6 +84,7 @@ > // > ------------------------------------------------------------------------- > > @Test > + @Ignore > public void testUpdateTranslation() > throws Exception > { > @@ -153,6 +155,7 @@ > } > > @Test > + @Ignore > public void testAddObject() > throws Exception > { > @@ -196,6 +199,7 @@ > } > > @Test > + @Ignore > public void testVerify() > throws Exception > { > @@ -247,6 +251,7 @@ > } > > @Test > + @Ignore > public void testGetAvailableLocales() > throws Exception > { > @@ -272,6 +277,7 @@ > } > > @Test > + @Ignore > public void testAddTranslation() > throws Exception > { > @@ -289,6 +295,7 @@ > } > > @Test > + @Ignore > public void testSetToFallback() > throws Exception > { > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java > 2009-08-12 21:06:37 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java > 2009-10-31 01:31:57 +0000 > @@ -47,6 +47,8 @@ > */ > public abstract class AbstractConverter<T> > { > + protected static final String EMPTY = ""; > + > // > ------------------------------------------------------------------------- > // Properties > // > ------------------------------------------------------------------------- > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java > 2009-08-12 21:06:37 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java > 2009-10-31 01:31:57 +0000 > @@ -149,14 +149,11 @@ > > for ( final CompleteDataSetRegistration registration : > registrations ) > { > - writer.openElement( ELEMENT_NAME ); > - > - writer.writeElement( FIELD_DATASET, String.valueOf( > registration.getDataSet().getId() ) ); > - writer.writeElement( FIELD_PERIOD, String.valueOf( > registration.getPeriod().getId() ) ); > - writer.writeElement( FIELD_SOURCE, String.valueOf( > registration.getSource().getId() ) ); > - writer.writeElement( FIELD_DATE, > DateUtils.getMediumDateString( registration.getDate() ) ); > - > - writer.closeElement(); > + writer.writeElement( ELEMENT_NAME, EMPTY, > + FIELD_DATASET, String.valueOf( > registration.getDataSet().getId() ), > + FIELD_PERIOD, String.valueOf( > registration.getPeriod().getId() ), > + FIELD_SOURCE, String.valueOf( > registration.getSource().getId() ), > + FIELD_DATE, DateUtils.getMediumDateString( > registration.getDate() ) ); > } > > writer.closeElement(); > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java > 2009-10-18 22:44:41 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java > 2009-10-31 01:31:57 +0000 > @@ -103,8 +103,6 @@ > writer.writeElement( FIELD_ID, String.valueOf( > categoryOption.getId() ) ); > writer.writeElement( FIELD_NAME, categoryOption.getName() > ); > > - //TODO add shortname > - > writer.closeElement(); > } > > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java > 2009-09-11 17:26:52 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java > 2009-10-31 01:31:57 +0000 > @@ -108,8 +108,6 @@ > Collection<DataSet> dataSets = dataSetService.getDataSets( > params.getDataSets() ); > > Collection<DataElement> elements = > dataElementService.getDataElements( params.getAllDataElements() ); > - System.out.println( "datasets " + dataSets.size() ); > - System.out.println( "dataelmts " + elements.size() ); > > if ( dataSets != null && dataSets.size() > 0 && elements != null && > elements.size() > 0 ) > { > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataValueConverter.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataValueConverter.java > 2009-08-12 21:06:37 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataValueConverter.java > 2009-10-31 01:31:57 +0000 > @@ -153,18 +153,15 @@ > > for ( final DeflatedDataValue value : values ) > { > - writer.openElement( ELEMENT_NAME ); > - > - writer.writeElement( FIELD_DATAELEMENT, > String.valueOf( value.getDataElementId() ) ); > - writer.writeElement( FIELD_PERIOD, > String.valueOf( value.getPeriodId() ) ); > - writer.writeElement( FIELD_SOURCE, > String.valueOf( value.getSourceId() ) ); > - writer.writeElement( FIELD_VALUE, > value.getValue() ); > - writer.writeElement( FIELD_STOREDBY, > value.getStoredBy() ); > - writer.writeElement( FIELD_TIMESTAMP, > DateUtils.getMediumDateString( value.getTimestamp() ) ); > - writer.writeElement( FIELD_COMMENT, > value.getComment() ); > - writer.writeElement( > FIELD_CATEGORY_OPTION_COMBO, String.valueOf( > value.getCategoryOptionComboId() ) ); > - > - writer.closeElement(); > + writer.writeElement( ELEMENT_NAME, EMPTY, > + FIELD_DATAELEMENT, String.valueOf( > value.getDataElementId() ), > + FIELD_PERIOD, String.valueOf( > value.getPeriodId() ), > + FIELD_SOURCE, String.valueOf( > value.getSourceId() ), > + FIELD_VALUE, value.getValue(), > + FIELD_STOREDBY, value.getStoredBy(), > + FIELD_TIMESTAMP, > DateUtils.getMediumDateString( value.getTimestamp() ), > + FIELD_COMMENT, value.getComment(), > + FIELD_CATEGORY_OPTION_COMBO, > String.valueOf( value.getCategoryOptionComboId() ) ); > } > } > } > > === 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-10-30 19:08:52 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java > 2009-10-31 01:31:57 +0000 > @@ -390,7 +390,7 @@ > > } > > - void parseDXFv1( ImportParams params, XMLReader reader ) > + private void parseDXFv1( ImportParams params, XMLReader reader ) > { > while ( reader.next() ) > { > > === modified file > 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java' > --- > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java > 2009-10-30 18:20:30 +0000 > +++ > dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/V2Parser.java > 2009-10-31 01:31:57 +0000 > @@ -27,27 +27,16 @@ > * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > - > -import javax.xml.parsers.SAXParserFactory; > -import javax.xml.parsers.ParserConfigurationException; > +import javax.xml.bind.JAXBContext; > +import javax.xml.bind.Unmarshaller; > import javax.xml.stream.XMLStreamReader; > -import javax.xml.bind.*; > - > -import org.xml.sax.XMLReader; > -import org.xml.sax.ContentHandler; > -import org.xml.sax.InputSource; > -import org.xml.sax.Attributes; > -import org.xml.sax.SAXException; > - > -import org.xml.sax.helpers.XMLFilterImpl; > - > -import org.hisp.dhis.importexport.dxf.v2object.*; > + > +import org.hisp.dhis.importexport.dxf.v2object.DataValues; > +import org.hisp.dhis.importexport.dxf.v2object.Metadata; > > /** > * @author Bob Jolliffe > */ > - > - > public class V2Parser { > > protected JAXBContext metadata_ctx; > > === modified file > 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java' > --- > dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java > 2009-08-24 13:55:25 +0000 > +++ > dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java > 2009-10-31 01:31:57 +0000 > @@ -104,7 +104,7 @@ > final SimpleDateFormat format = new SimpleDateFormat(); > format.applyPattern( "yyyy-MM-dd" ); > > - return dateString != null ? format.parse( dateString ) : null; > + return dateString != null && !dateString.isEmpty() ? > format.parse( dateString ) : null; > } > catch ( ParseException ex ) > { > > === modified file > 'dhis-2/dhis-support/dhis-support-test/src/main/resources/log4j.properties' > --- > dhis-2/dhis-support/dhis-support-test/src/main/resources/log4j.properties > 2009-10-30 18:20:30 +0000 > +++ > dhis-2/dhis-support/dhis-support-test/src/main/resources/log4j.properties > 2009-10-31 01:31:57 +0000 > @@ -8,4 +8,4 @@ > > # Categories (order: DEBUG, INFO, WARN, ERROR, FATAL) > log4j.rootCategory = FATAL, console > -log4j.category.org.hisp.dhis = INFO > +log4j.category.org.hisp.dhis = WARN > > === modified file > 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm' > --- > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm > 2009-10-30 07:06:12 +0000 > +++ > dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm > 2009-10-31 01:31:57 +0000 > @@ -1,18 +1,24 @@ > -<h2>$i18n.getString( "data_element_group_set" )</h2> > -<table> > + > +<h3>$i18n.getString( "data_element_group_set" )</h3> > + > +<table class="mainPageTable"> > <tr> > - <td> > - <table style="min-width:500px;"> > - <thead> > - <tr> > - <th>$i18n.getString( > "filter_by_name" ) <input type="text" id="dataElementGroupSetFilter" > style="width:300px" onkeyup="filterDataElementSet( this.value )"/></th> > - <td align="right"><input > type=button value="$i18n.getString( "add_new" )" > onclick="window.location='openAddDataElementGroupSet.action'"/></td> > - </tr> > - <tr> > - <th>$i18n.getString( "name" > )</th> > - <th > width="100px">$i18n.getString( "operations" )</th> > - </tr> > - </thead> > + <td style="vertical-align:top"> > + > + <table class="listTable"> > + <col> > + <col width="20"> > + <col width="20"> > + <col width="20"> > + <col width="20"> > + <tr> > + <td>$i18n.getString( "filter_by_name" ): <form > style="display:inline" action="none" onsubmit="return false"><div > style="inline"><input type="text" onkeyup="filterValues( this.value > )"></div></form></td> > + <td align="right"><input > type=button value="$i18n.getString( "add_new" )" > onclick="window.location='openAddDataElementGroupSet.action'"/></td> > + </tr> > + <tr> > + <th>$i18n.getString( "name" )</th> > + <th width="100px">$i18n.getString( > "operations" )</th> > + </tr> > <tbody id="contents"> > > </tbody> > @@ -39,13 +45,4 @@ > var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , > "'")'; > var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , > "'")'; > var i18n_information = '$encoder.jsEscape( $i18n.getString( > "show_details" ) , "'")'; > - > - > - var dataElementGroupSets = new Array(); > - #foreach( $dataElementGroupSet in $dataElementGroupSets ) > - dataElementGroupSets.push( new DataElementGroupSet( > $dataElementGroupSet.id, "$encoder.htmlEncode( $dataElementGroupSet.name )" > ) ); > - #end > - > - filterDataElementSet( $("#dataElementGroupSetFilter").val() ); > - > -</script> > \ No newline at end of file > +</script> > > === modified file 'dhis-2/pom.xml' > --- dhis-2/pom.xml 2009-10-30 19:08:52 +0000 > +++ dhis-2/pom.xml 2009-10-31 01:31:57 +0000 > @@ -42,15 +42,15 @@ > <url>scp://</url> > </repository> > </distributionManagement> > - <!--<repositories> > - <repository> > - <id>amplecode_maven2_repo</id> > - <name>AmpleCode Maven 2 repository</name> > - <url>http://www.amplecode.org/maven2</url> > - </repository> > + > + <repositories> > + <repository> > + <id>amplecode_maven2_repo</id> > + <name>AmpleCode Maven 2 repository</name> > + <url>http://www.amplecode.org/maven2</url> > + </repository> > </repositories> > - --> > - > + > <issueManagement> > <system>Trac</system> > <url>https://launchpad.net/dhis2</url> > @@ -250,7 +250,7 @@ > <dependency> > <groupId>org.amplecode</groupId> > <artifactId>staxwax</artifactId> > - <version>1.0.7</version> > + <version>1.0.8</version> > </dependency> > <dependency> > <groupId>org.amplecode</groupId> > > > _______________________________________________ > Mailing list: > https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs> > Post to : [email protected] > Unsubscribe : > https://launchpad.net/~dhis2-devs<https://launchpad.net/%7Edhis2-devs> > More help : https://help.launchpad.net/ListHelp > >
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
