[Bprocessor-commit] model/src/etc bprocessor.xsd,1.13,1.14

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/etc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8300/src/etc

Modified Files:
	bprocessor.xsd 
Log Message:
Fixed the problem with loading by two hacks. First by making three lists one for Point, Line and Coordinatesystem. Then for some reason it is not possible to make a origin reference to a vertex??? Have to check this further cause can't make reason out of that... But end of it is it works at the moment...

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** bprocessor.xsd	31 Jul 2006 11:25:51 -0000	1.13
--- bprocessor.xsd	18 Aug 2006 07:01:25 -0000	1.14
***************
*** 10,14 ****
    <xsd:complexType name="EntityType">
      <xsd:sequence>
!       <xsd:element name="id" type="xsd:long" maxOccurs="1" minOccurs="1"/>
        <xsd:element name="progid" type="xsd:long" maxOccurs="1" minOccurs="0"/>
      </xsd:sequence>
--- 10,14 ----
    <xsd:complexType name="EntityType">
      <xsd:sequence>
!       <xsd:element name="id" type="xsd:long" maxOccurs="1" minOccurs="0"/>
        <xsd:element name="progid" type="xsd:long" maxOccurs="1" minOccurs="0"/>
      </xsd:sequence>
***************
*** 19,23 ****
        <xsd:extension base="EntityType">
  		    <xsd:sequence>
!     			  <xsd:element ref="origin" maxOccurs="1" minOccurs="1"/>
      			  <xsd:element name="active" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
      			  <xsd:element name="editable" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
--- 19,23 ----
        <xsd:extension base="EntityType">
  		    <xsd:sequence>
!     			  <xsd:element ref="vertex" maxOccurs="1" minOccurs="0"/>
      			  <xsd:element name="active" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
      			  <xsd:element name="editable" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
***************
*** 42,46 ****
            <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
            <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
!           <xsd:element ref="constructor" maxOccurs="unbounded" minOccurs="0"/>         
          </xsd:sequence>
        </xsd:extension>
--- 42,48 ----
            <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
            <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
!           <xsd:element ref="line" maxOccurs="unbounded" minOccurs="0"/>
!           <xsd:element ref="point" maxOccurs="unbounded" minOccurs="0"/>
!           <xsd:element ref="coordinatesystem" maxOccurs="unbounded" minOccurs="0"/>
          </xsd:sequence>
        </xsd:extension>
***************
*** 106,110 ****
        <xsd:extension base="ConstructorType">
  	    <xsd:sequence>
! 	      <xsd:element ref="direction" maxOccurs="1" minOccurs="1"/> 
  	    </xsd:sequence>
  	  </xsd:extension>
--- 108,112 ----
        <xsd:extension base="ConstructorType">
  	    <xsd:sequence>
! 	      <xsd:element ref="direction" maxOccurs="1" minOccurs="0"/> 
  	    </xsd:sequence>
  	  </xsd:extension>
***************
*** 126,130 ****
  	    <xsd:sequence>
  	   		<xsd:element name="onlyplane" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>   
! 	      <xsd:element ref="ijn" maxOccurs="3" minOccurs="3"/>
  	    </xsd:sequence>
  	  		</xsd:extension>
--- 128,132 ----
  	    <xsd:sequence>
  	   		<xsd:element name="onlyplane" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>   
! 	      <xsd:element ref="ijn" maxOccurs="1" minOccurs="0"/>
  	    </xsd:sequence>
  	  		</xsd:extension>
***************
*** 132,135 ****
--- 134,143 ----
    </xsd:complexType>
  
+   <xsd:complexType name="VertexesType">
+ 	  <xsd:sequence>
+ 	    <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
+ 	  </xsd:sequence>
+   </xsd:complexType>
+ 
    <!-- Element definitions -->
    <xsd:element name="space" type="SpaceType"/>
***************
*** 138,145 ****
    <xsd:element name="vertex" type="VertexType"/>
    <xsd:element name="material" type="MaterialType"/>
!   <xsd:element name="constructor" type="ConstructorType"/>
    <xsd:element name="origin" type="VertexType"/>
!   <xsd:element name="direction" type="VertexType"/>
!   <xsd:element name="ijn" type="VertexType"/>
  
    <!-- Main element -->
--- 146,155 ----
    <xsd:element name="vertex" type="VertexType"/>
    <xsd:element name="material" type="MaterialType"/>
!   <xsd:element name="line" type="LineType"/>
!   <xsd:element name="point" type="PointType"/>
!   <xsd:element name="coordinatesystem" type="CoordinateSystemType"/>
    <xsd:element name="origin" type="VertexType"/>
!   <xsd:element name="direction" type="VertexesType"/>
!   <xsd:element name="ijn" type="VertexesType"/>
  
    <!-- Main element -->