dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 71
committer: Bob Jolliffe <bobj@bobj-laptop>
branch nick: dhis2-docbook-docs
timestamp: Mon 2009-12-14 14:42:50 +0000
message:
  Removed extra "IndicatorGroupSets" definition
modified:
  src/schemas/dxf_v2_schema/dxf2.rng
  src/schemas/dxf_v2_schema/sample_dxf2.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription.

=== modified file 'src/schemas/dxf_v2_schema/dxf2.rng'
--- src/schemas/dxf_v2_schema/dxf2.rng	2009-12-14 14:36:53 +0000
+++ src/schemas/dxf_v2_schema/dxf2.rng	2009-12-14 14:42:50 +0000
@@ -6,8 +6,6 @@
     dxf2.rnc and dxf.xsd are derived using jing
     
     TODO:
-    fix up consistent naming of idref attributes
-    fix sample data
     add missing elements
   -->
   <!-- These are toplevel elements of dxf format -->
@@ -258,7 +256,7 @@
                 <ref name="identifiableObject"/>
                 <zeroOrMore>
                   <element name="indicator">
-                    <attribute name="idref">
+                    <attribute name="ref">
                       <ref name="dxfIDRef"/>
                     </attribute>
                   </element>
@@ -358,23 +356,6 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="IndicatorGroupSets">
-    <element name="IndicatorGroupSets" ns="http://dhis2.org/ns/schema/dxf2";>
-      <zeroOrMore>
-        <element name="IndicatorGroupSet">
-          <ref name="identifiableObject"/>
-          <oneOrMore>
-            <element name="IndicatorGroup">
-              <ref name="identifiableObject"/>
-              <element name="IndicatorId">
-                <data type="integer"/>
-              </element>
-            </element>
-          </oneOrMore>
-        </element>
-      </zeroOrMore>
-    </element>
-  </define>
   
   <!-- Data Dictionary Definition -->
   <define name="dataDictionaries">

=== modified file 'src/schemas/dxf_v2_schema/sample_dxf2.xml'
--- src/schemas/dxf_v2_schema/sample_dxf2.xml	2009-12-14 14:36:53 +0000
+++ src/schemas/dxf_v2_schema/sample_dxf2.xml	2009-12-14 14:42:50 +0000
@@ -4,7 +4,7 @@
 <dxf xmlns="http://dhis2.org/ns/schema/dxf2"; >
 
     <metadata>
-                
+               
         <orgUnitStructure>
             <groupSets/>
             <organisationUnitGroups/>