X-Git-Url: https://git.wikimedia.ca/?p=eccc_schema.git;a=blobdiff_plain;f=bulkschema.xsd;h=a0326456fb382150c3cd608cd28c4ed96795a8a9;hp=ccc463335650e268b3eaac8b5197270153390298;hb=HEAD;hpb=c14d0d4edae22b0ef5aa477dbe35a8f0cd216751

diff --git a/bulkschema.xsd b/bulkschema.xsd
index ccc4633..a032645 100644
--- a/bulkschema.xsd
+++ b/bulkschema.xsd
@@ -66,147 +66,200 @@
                         </xsd:sequence>
                     </xsd:complexType>
                 </xsd:element>
-                <xsd:element name="stationdata" maxOccurs="unbounded">
+                <xsd:choice>
+                  <xsd:element name="stationdata" maxOccurs="unbounded">
+                      <xsd:complexType>
+                          <xsd:sequence>
+                            <xsd:element name="meanmaxtemp">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="meanmintemp">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="meanmonthtemp">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="extrmaxtemp">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="extrmintemp">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="totrain">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="totsnow">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="snowonground" minOccurs="0">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="totprecip">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="grndsnowlastday">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="dirmaxgust">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="speedmaxgust">
+                              <xsd:complexType>
+                                <xsd:simpleContent>
+                                  <xsd:extension base="xsd:string">
+                                    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                  </xsd:extension>
+                                </xsd:simpleContent>
+                              </xsd:complexType>
+                            </xsd:element>
+                          </xsd:sequence>
+                          <xsd:attribute name="day" type="xsd:string" use="optional"/>
+                          <xsd:attribute name="month" type="xsd:string" use="required"/>
+                          <xsd:attribute name="year" type="xsd:string" use="required"/>
+                      </xsd:complexType>
+                  </xsd:element>
+                  <xsd:element name="month" maxOccurs="unbounded">
                     <xsd:complexType>
-                        <xsd:sequence>
-                          <xsd:element name="meanmaxtemp">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="meanmintemp">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="meanmonthtemp">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="extrmaxtemp">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="extrmintemp">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="totrain">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="totsnow">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="snowonground" minOccurs="0">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="totprecip">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="grndsnowlastday">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="dirmaxgust">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                          <xsd:element name="speedmaxgust">
-                            <xsd:complexType>
-                              <xsd:simpleContent>
-                                <xsd:extension base="xsd:string">
-                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
-                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
-                                </xsd:extension>
-                              </xsd:simpleContent>
-                            </xsd:complexType>
-                          </xsd:element>
-                        </xsd:sequence>
-                        <xsd:attribute name="day" type="xsd:string" use="optional"/>
-                        <xsd:attribute name="month" type="xsd:string" use="required"/>
-                        <xsd:attribute name="year" type="xsd:string" use="required"/>
+                      <xsd:sequence>
+                        <xsd:element name="day" minOccurs="0" maxOccurs="unbounded">
+                          <xsd:complexType>
+                            <xsd:sequence>
+                              <xsd:element name="temperature" maxOccurs="unbounded">
+                                <xsd:complexType>
+                                  <xsd:simpleContent>
+                                    <xsd:extension base="xsd:string">
+                                      <xsd:attribute name="class" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="unitType" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="year" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="period" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="quality" type="xsd:string" use="optional"/>
+                                    </xsd:extension>
+                                  </xsd:simpleContent>
+                                </xsd:complexType>
+                              </xsd:element>
+                              <xsd:element name="precipitation" maxOccurs="unbounded">
+                                <xsd:complexType>
+                                  <xsd:simpleContent>
+                                    <xsd:extension base="xsd:string">
+                                      <xsd:attribute name="class" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="unitType" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="year" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="period" type="xsd:string" use="optional"/>
+                                      <xsd:attribute name="quality" type="xsd:string" use="optional"/>
+                                    </xsd:extension>
+                                  </xsd:simpleContent>
+                                </xsd:complexType>
+                              </xsd:element>
+                              <xsd:element name="pop">
+                                <xsd:complexType>
+                                  <xsd:simpleContent>
+                                    <xsd:extension base="xsd:string">
+                                      <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                    </xsd:extension>
+                                  </xsd:simpleContent>
+                                </xsd:complexType>
+                              </xsd:element>
+                            </xsd:sequence>
+                            <xsd:attribute name="index" type="xsd:integer" use="required"/>
+                          </xsd:complexType>
+                        </xsd:element>
+                      </xsd:sequence>
+                      <xsd:attribute name="index" type="xsd:integer" use="required"/>
                     </xsd:complexType>
-                </xsd:element>
+                  </xsd:element>
+                </xsd:choice>
             </xsd:sequence>
         </xsd:complexType>
     </xsd:element>