Commit 14fa883e authored by Fabio Vitello's avatar Fabio Vitello
Browse files

#595 Removed unneeded tag in IFDistConfiguration CDB

parent a1973220

Noto/Servers/NotoPyIfDistributor/config/CDB/schemas/IFDistConfiguration.xsd

+0 −37
Original line number Diff line number Diff line
@@ -14,44 +14,7 @@ 
	<xs:import namespace="urn:schemas-cosylab-com:CDB:1.0" schemaLocation="CDB.xsd"/>

	<xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>

   

    

   <xs:simpleType name="AttIDType">

	   <xs:restriction base="xs:unsignedInt">

   	   <xs:minInclusive value="0" />

         <xs:maxInclusive value="3" />

      </xs:restriction>

	</xs:simpleType>



   <xs:simpleType name="AttValueType">

	   <xs:restriction base="xs:decimal">

   	   <xs:minInclusive value="0.0" />

         <xs:maxInclusive value="31.5" />

      </xs:restriction>

	</xs:simpleType>



   <xs:complexType name="AttHeader">

   	<xs:attribute name="ID" type="AttIDType"   />

      <xs:attribute name="Value" type="AttValueType" />

	</xs:complexType> 

    

	<xs:complexType name="BoardHeader">

        <xs:sequence>

            <xs:element name="Attenuator" type="AttHeader" minOccurs="1" maxOccurs="unbounded" />

        </xs:sequence>

        <xs:attribute name="number" type="xs:unsignedInt" use="required"/>

   </xs:complexType>

   

  	<xs:complexType name="ConfigurationHeader">

 		<xs:sequence>

         <xs:element name="Board" type="BoardHeader" minOccurs="1" maxOccurs="unbounded" />

      </xs:sequence>

      <xs:attribute name="name" type="xs:string" use="required" />

 	</xs:complexType>

   

   <xs:complexType name="IFDistConfigurationType">

		<xs:sequence>	

			<xs:element name="Configuration" type="ConfigurationHeader" minOccurs="0" maxOccurs="unbounded" />

		</xs:sequence>



		<xs:attribute name="IP" type="xs:string" use="required" />

      <xs:attribute name="PORT" type="xs:unsignedShort" use="required" />

Noto/Servers/NotoPyIfDistributor/src/_ifdist.py

+1 −3
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ def send_command(ip, port, command): 


def cdb(xmlstr):

	root=ET.fromstring(xmlstr)	

	configurations=root.findall('{urn:schemas-cosylab-com:IFDistConfiguration:1.0}Configuration')

	

	return root.items()[0][1],root.items()[1][1]

	

def main(argv):