Added new catalog scheme. Refs #7866.

mantidproject · Oct 1, 2013 · 4b5b88c · 4b5b88c
1 parent dfb629c
commit 4b5b88c
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 19 deletions.
diff --git 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
@@ -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">