diff --git a/Code/Mantid/instrument/Facilities.xml b/Code/Mantid/instrument/Facilities.xml index 261759febb3989ab55e6582589882425544bc48b..ebea501b17ca802d05b84dfb6f025990d55d134e 100644 --- a/Code/Mantid/instrument/Facilities.xml +++ b/Code/Mantid/instrument/Facilities.xml @@ -7,10 +7,14 @@ </archive> <catalog name="ICat3Catalog"> + <soapendpoint url="https://facilities01.esc.rl.ac.uk:443/ICATService/ICAT"></soapendpoint> + <filelocation> + <prefix regex="\\isis\inst$"></prefix> + <windows replacement=""></windows> + <linux replacement="/archive"></linux> + <mac replacement="/archive"></mac> + </filelocation> </catalog> - - <soapEndPoint url="https://facilities01.esc.rl.ac.uk:443/ICATService/ICAT"> - </soapEndPoint> <instrument name="ALF"> <technique>Single Crystal Diffraction</technique> diff --git a/Code/Mantid/instrument/Schema/FacilitiesSchema.xsd b/Code/Mantid/instrument/Schema/FacilitiesSchema.xsd index fd9fa04422083272891e8cce77e3f29a68f999ac..e9e7f75d744841a07f839cf60afe0c938776a13e 100644 --- a/Code/Mantid/instrument/Schema/FacilitiesSchema.xsd +++ b/Code/Mantid/instrument/Schema/FacilitiesSchema.xsd @@ -29,24 +29,40 @@ <xs:attribute name="type"/> </xs:complexType> </xs:element> - <xs:element name="catalog" minOccurs="0"> + <xs:element name="catalog"> <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="name" type="xs:string" use="required"/> - </xs:extension> - </xs:simpleContent> + <xs:element name="soapendpoint"> + <xs:complexType> + <xs:attribute name="url" type="xs:string"/> + </xs:complexType> + </xs:element> + <xs:element name="filelocation"> + <xs:complexType> + <xs:element name="prefix"> + <xs:complexType> + <xs:attribute name="regex" type="xs:string"/> + </xs:complexType> + </xs:element> + <xs:element name="windows"> + <xs:complexType> + <xs:attribute name="replacement" type="xs:string"/> + </xs:complexType> + </xs:element> + <xs:element name="linux"> + <xs:complexType> + <xs:attribute name="replacement" type="xs:string"/> + </xs:complexType> + </xs:element> + <xs:element name="mac"> + <xs:complexType> + <xs:attribute name="replacement" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:complexType> + </xs:element> + <xs:attribute name="name" type="xs:string"/> </xs:complexType> - </xs:element> - <xs:element name="soapEndPoint" minOccurs="0"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="url" type="xs:string" use="required" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> + </xs:element> <xs:element name="instrument" maxOccurs="unbounded"> <xs:complexType> <xs:choice maxOccurs="unbounded">