dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2286
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2010-09-30 12:22:27 +0100
message:
  Supporting indicator import from WHO IMR
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/transform/transforms.xml


--
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/zip/ZipAnalyzer.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-09-30 11:22:27 +0000
@@ -48,6 +48,7 @@
     static
     {
         knownDataStreams.add( "Data_CROSS.xml" );        // sdmx cross sectional data file
+        knownDataStreams.add( "GMS_INDICATOR.xml" );     // sdmx indicator metadata
         knownDataStreams.add( "xl/workbook.xml" );       // xslsx file
         knownDataStreams.add( "content.xml" );           // xslsx file
     }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/transform/transforms.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/transform/transforms.xml	2010-07-13 00:31:39 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/transform/transforms.xml	2010-09-30 11:22:27 +0000
@@ -8,4 +8,8 @@
         <xslt>cross2dxf.xsl</xslt>
         <description>SDMX-HD Cross Sectional Data Import</description>
     </transform>
+    <transform tag="{http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message}GenericMetadata";>
+        <xslt>imr2dxf.xsl</xslt>
+        <description>SDMX-HD Cross Sectional Data Import</description>
+    </transform>
 </transforms>