Updated xsd

Author: chris

xsd/input.xsd

@@ -43,5 +43,14 @@
     </xs:sequence>
     <xs:attribute type="xs:string" name="id" use="required"/>
   </xs:complexType>
+  <xs:complexType name="subTrade">
+    <xs:sequence>
+      <xs:element type="oreTradeType" name="SubTradeType"/>
+      <xs:element type="envelope" name="Envelope" minOccurs="0"/>
+      <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/>
+      <xs:group ref="oreTradeData" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="id"/>
+  </xs:complexType>
 
 </xs:schema>

xsd/instruments.xsd

@@ -2351,8 +2351,9 @@
   </xs:complexType>
 
 <xs:element name="subTradeGroup" abstract="true"/>
-<xs:element name="Trade" substitutionGroup="subTradeGroup"/>
-<xs:element name="SubTrade" substitutionGroup="subTradeGroup"/>
+<xs:element name="Trade" type="trade" substitutionGroup="subTradeGroup"/>
+<xs:element name="SubTrade" type="subTrade" substitutionGroup="subTradeGroup"/>
+
 
   <xs:complexType name="trsUnderlyingData">
     <xs:sequence>
@@ -2361,29 +2362,21 @@
 		 <xs:complexType>
           <xs:sequence>
            <xs:element type="xs:string" name="Id"/>
-           <xs:element ref="subTradeGroup">
-            <xs:complexType>
-             <xs:sequence>
-              <xs:element type="oreTradeType" name="TradeType"/>
-              <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-              <xs:group ref="oreTradeData"/>
-             </xs:sequence>
-             <xs:attribute type="xs:string" name="id"/>
-            </xs:complexType>
-           </xs:element>
+			<xs:element ref="subTradeGroup"/>
 		  </xs:sequence>
          </xs:complexType>
         </xs:element>
-		<xs:element name="Trade">
-         <xs:complexType>
-           <xs:sequence>
-            <xs:element type="oreTradeType" name="TradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:group ref="oreTradeData"/>
-            </xs:sequence>
-          <xs:attribute type="xs:string" name="id"/>
-         </xs:complexType>
-        </xs:element>
+		<!-- <xs:element name="Trade"> -->
+         <!-- <xs:complexType> -->
+           <!-- <xs:sequence> -->
+            <!-- <xs:element type="oreTradeType" name="TradeType"/> -->
+            <!-- <xs:element type="envelope" name="Envelope" minOccurs="0"/> -->
+            <!-- <xs:group ref="oreTradeData"/> -->
+            <!-- </xs:sequence> -->
+          <!-- <xs:attribute type="xs:string" name="id"/> -->
+         <!-- </xs:complexType> -->
+        <!-- </xs:element> -->
+		<xs:element ref="subTradeGroup"/>
         <xs:element name="PortfolioIndexTradeData" minOccurs="0">
          <xs:complexType>
            <xs:sequence>
@@ -2591,16 +2584,17 @@
   <xs:complexType name="cboBondBasketData">
 
 	<xs:sequence>
-      <xs:element name="Trade" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:all>
-            <xs:element type="oreTradeType" name="TradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:element type="bondData" name="BondData" maxOccurs="1" minOccurs="0"/>
-          </xs:all>
-          <xs:attribute type="xs:string" name="id"/>
-        </xs:complexType>
-      </xs:element>
+		<xs:element ref="subTradeGroup" maxOccurs="unbounded"/>
+      <!-- <xs:element name="Trade" maxOccurs="unbounded"> -->
+        <!-- <xs:complexType> -->
+          <!-- <xs:all> -->
+            <!-- <xs:element type="oreTradeType" name="TradeType"/> -->
+            <!-- <xs:element type="envelope" name="Envelope" minOccurs="0"/> -->
+            <!-- <xs:element type="bondData" name="BondData" maxOccurs="1" minOccurs="0"/> -->
+          <!-- </xs:all> -->
+          <!-- <xs:attribute type="xs:string" name="id"/> -->
+        <!-- </xs:complexType> -->
+      <!-- </xs:element> -->
     </xs:sequence>
   </xs:complexType>
 
@@ -3033,16 +3027,17 @@
 
   <xs:complexType name="compositeTradeComponents">
     <xs:sequence>
-	  <xs:element name="Trade" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element type="oreTradeType" name="TradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:group ref="oreTradeData"/>
-          </xs:sequence>
-          <xs:attribute type="xs:string" name="id"/>
-        </xs:complexType>
-      </xs:element>
+		<xs:element ref="subTradeGroup" maxOccurs="unbounded"/>
+	  <!-- <xs:element name="Trade" maxOccurs="unbounded"> -->
+        <!-- <xs:complexType> -->
+          <!-- <xs:sequence> -->
+            <!-- <xs:element type="oreTradeType" name="TradeType"/> -->
+            <!-- <xs:element type="envelope" name="Envelope" minOccurs="0"/> -->
+            <!-- <xs:group ref="oreTradeData"/> -->
+          <!-- </xs:sequence> -->
+          <!-- <xs:attribute type="xs:string" name="id"/> -->
+        <!-- </xs:complexType> -->
+      <!-- </xs:element> -->
     </xs:sequence>
   </xs:complexType>