X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rng;h=1e7ae212170facdcced4e7374e32bed9ef32d98d;hb=d80337cea4e3784c52fcf3f9238413c9b12da526;hp=077fd8678b75d5c6f908c371e2f3304c2c56b350;hpb=7c89fef430e882ec9b083e994c4d15faff2e4be8;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rng b/xml/schema/metaproxy.rng
index 077fd86..1e7ae21 100644
--- a/xml/schema/metaproxy.rng
+++ b/xml/schema/metaproxy.rng
@@ -46,6 +46,11 @@
       <attribute name="version">
         <value>1.0</value>
       </attribute>
+      <optional>
+        <element name="mp:dlpath">
+          <data type="string"/>
+        </element>
+      </optional>
       <element name="mp:start">
         <attribute name="route">
           <data type="NCName"/>
@@ -82,9 +87,11 @@
         <ref name="filter_auth_simple"/>
         <ref name="filter_backend_test"/>
         <ref name="filter_bounce"/>
+        <ref name="filter_cgi"/>
         <ref name="filter_cql_rpn"/>
         <ref name="filter_frontend_net"/>
         <ref name="filter_http_file"/>
+        <ref name="filter_limit"/>
         <ref name="filter_load_balance"/>
         <ref name="filter_log"/>
         <ref name="filter_multi"/>
@@ -212,6 +219,11 @@
         <data type="integer"/>
       </element>
     </optional>
+    <optional>
+      <element name="mp:connect-max">
+        <data type="integer"/>
+      </element>
+    </optional>
   </define>
   <define name="filter_http_file">
     <attribute name="type">
@@ -419,6 +431,9 @@
         <attribute name="ttl">
           <data type="integer"/>
         </attribute>
+        <attribute name="optimizesearch">
+          <data type="boolean"/>
+        </attribute>
       </element>
     </optional>
     <optional>
@@ -443,14 +458,14 @@
         <data type="NCName"/>
       </attribute>
     </optional>
-    <oneOrMore>
+    <zeroOrMore>
       <element name="mp:database">
         <attribute name="name">
           <data type="NCName"/>
         </attribute>
         <ref name="any"/>
       </element>
-    </oneOrMore>
+    </zeroOrMore>
   </define>
   <define name="filter_virt_db">
     <attribute name="type">
@@ -466,6 +481,11 @@
         <data type="NCName"/>
       </attribute>
     </optional>
+    <optional>
+      <element name="mp:pass-vhosts">
+        <data type="boolean"/>
+      </element>
+    </optional>
     <oneOrMore>
       <element name="mp:virtual">
         <optional>
@@ -474,7 +494,7 @@
           </attribute>
         </optional>
         <element name="mp:database">
-          <data type="NCName"/>
+          <data type="string"/>
         </element>
         <oneOrMore>
           <element name="mp:target">
@@ -514,6 +534,50 @@
       </element>
     </optional>
   </define>
+  <define name="filter_limit">
+    <attribute name="type">
+      <value>limit</value>
+    </attribute>
+    <optional>
+      <element name="mp:limit">
+        <optional>
+          <attribute name="bandwidth">
+            <data type="integer"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="pdu">
+            <data type="integer"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="search">
+            <data type="integer"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="retrieve">
+            <data type="integer"/>
+          </attribute>
+        </optional>
+      </element>
+    </optional>
+  </define>
+  <define name="filter_cgi">
+    <attribute name="type">
+      <value>cgi</value>
+    </attribute>
+    <zeroOrMore>
+      <element name="mp:map">
+        <attribute name="path">
+          <data type="string"/>
+        </attribute>
+        <attribute name="exec">
+          <data type="string"/>
+        </attribute>
+      </element>
+    </zeroOrMore>
+  </define>
 </grammar>
 <!--
   filter_zeerex_explain =