X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2Fconfig.xsd;h=e662e170804f1bbec02f84f71d360de7fa32bc48;hb=31ab5dfd9f2816f02a5da7abfc3fc152e45e0f17;hp=ceb05ed7493491a4326678887562f1c459908dde;hpb=6e22885ae68f295a0f8a116d688885a8575e8d4f;p=metaproxy-moved-to-github.git

diff --git a/etc/config.xsd b/etc/config.xsd
index ceb05ed..e662e17 100644
--- a/etc/config.xsd
+++ b/etc/config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: config.xsd,v 1.11 2006-01-18 14:12:50 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.20 2006-06-21 09:16:53 adam Exp $ -->
 <!--
 	This Schema prescribes the format of YP2 configuration files.
 	Invoke it like this:
@@ -58,16 +58,35 @@
         <xs:element ref="config:timeout"/>
 
 	<!-- type="log" -->
-        <xs:element ref="config:message"/>
+        <xs:sequence>
+         <xs:element minOccurs="0" ref="config:message"/>
+         <xs:element minOccurs="0" ref="config:filename"/>
+         <xs:element minOccurs="0" name="category">
+           <xs:complexType>
+            <xs:attribute name="request-session" type="xs:boolean"/>
+            <xs:attribute name="response-session" type="xs:boolean"/>
+            <xs:attribute name="session" type="xs:boolean"/>
+            <xs:attribute name="request-apdu" type="xs:boolean"/>
+            <xs:attribute name="response-apdu" type="xs:boolean"/>
+            <xs:attribute name="apdu" type="xs:boolean"/>
+            <xs:attribute name="init-options" type="xs:boolean"/>
+           </xs:complexType>
+         </xs:element>
+        </xs:sequence>
 
 	<!-- type="virt_db" or type="multi" -->
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
+        <xs:sequence>
+	  <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
+	  <xs:element minOccurs="0" maxOccurs="1" name="hideunavailable">
+	    <xs:complexType/>
+	  </xs:element>
+        </xs:sequence>
 
 	<!-- type="auth_simple" -->
         <xs:sequence>
 	  <xs:element minOccurs="0" ref="config:userRegister"/>
 	  <xs:element minOccurs="0" ref="config:targetRegister"/>
-	  <xs:element minOccurs="0" name="discardUnauthorisedDBs">
+	  <xs:element minOccurs="0" name="discardUnauthorisedTargets">
 	    <xs:complexType/>
 	  </xs:element>
         </xs:sequence>
@@ -76,11 +95,39 @@
 	<!-- No elements included -->
 
 	<!-- type="session_shared" -->
-	<!-- No example configuration to deduce from yet -->
+        <xs:sequence>
+	  <xs:element minOccurs="0" name="resultset">
+           <xs:complexType>
+            <xs:attribute name="ttl" type="xs:integer"/>
+            <xs:attribute name="max" type="xs:integer"/>
+           </xs:complexType>
+	  </xs:element>
+	  <xs:element minOccurs="0" name="session">
+           <xs:complexType>
+            <xs:attribute name="ttl" type="xs:integer"/>
+           </xs:complexType>
+	  </xs:element>
+	</xs:sequence>
 
 	<!-- type="template" -->
 	<!-- No example configuration to deduce from yet -->
 
+	<!-- type="http_file" -->
+        <xs:sequence>
+	  <xs:element ref="config:mimetypes"/>
+	  <xs:element name="area">
+	    <xs:complexType>
+	      <xs:sequence>
+		<xs:element ref="config:documentroot"/>
+		<xs:element ref="config:prefix"/>
+	      </xs:sequence>
+	    </xs:complexType>
+	  </xs:element>
+        </xs:sequence>
+
+	<!-- type="query_rewrite" -->
+	<xs:element ref="config:xslt"/>
+
       </xs:choice>
       <xs:attribute name="id" type="xs:NCName"/>
       <xs:attribute name="refid" type="xs:NCName"/>
@@ -96,6 +143,8 @@
             <xs:enumeration value="multi"/>
             <xs:enumeration value="session_shared"/>
             <xs:enumeration value="template"/>
+            <xs:enumeration value="http_file"/>
+            <xs:enumeration value="query_rewrite"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -106,9 +155,14 @@
   <xs:element name="port" type="xs:string"/>
   <xs:element name="timeout" type="xs:integer"/>
   <xs:element name="message" type="xs:NCName"/>
+  <xs:element name="filename" type="xs:string"/>
   <xs:element name="userRegister" type="xs:string"/>
   <xs:element name="targetRegister" type="xs:string"/>
-  <xs:element name="discardUnauthorisedDBs" type="xs:string"/>
+  <xs:element name="discardUnauthorisedTargets" type="xs:string"/>
+  <xs:element name="mimetypes" type="xs:string"/>
+  <xs:element name="documentroot" type="xs:string"/>
+  <xs:element name="prefix" type="xs:string"/>
+  <xs:element name="xslt" type="xs:string"/>
 
   <!-- ### This is used differently depending on whether it occurs
        within a "virt_db" or "multi" filter: for the former, it
@@ -134,7 +188,7 @@
   <xs:element name="routes">
     <xs:complexType>
       <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="config:route"/>
+        <xs:element minOccurs="1" maxOccurs="unbounded" ref="config:route"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>