X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=xml%2Fschema%2Fmetaproxy.rnc;h=12a44b372d99ba90b096d73a28df6f784ce8d112;hb=67753db293cb62940e4c2db3a6e5f635cd5b78c3;hp=6c5686cf5d24fdc3b50513e4caa9da60d18a9e3a;hpb=dcaa60fd6dcb4ff2d946f20fb6c928d9fb636ebb;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 6c5686c..12a44b3 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -50,9 +50,11 @@ filter =
     | filter_auth_simple
     | filter_backend_test
     | filter_bounce
+    | filter_cgi
     | filter_cql_rpn
     | filter_frontend_net
     | filter_http_file
+    | filter_limit
     | filter_load_balance
     | filter_log
     | filter_multi
@@ -99,7 +101,8 @@ filter_frontend_net =
   attribute name { xsd:NCName }?,
   element mp:threads { xsd:integer }?,
   element mp:port { xsd:string }+,
-  element mp:timeout { xsd:integer }?
+  element mp:timeout { xsd:integer }?,
+  element mp:connect-max { xsd:integer }?
 
 filter_http_file =
   attribute type { "http_file" },
@@ -129,6 +132,7 @@ filter_log =
     attribute init-options { xsd:boolean }?,
     attribute request-session { xsd:boolean }?,
     attribute response-session { xsd:boolean }?,
+    attribute session { xsd:boolean }?,
     attribute apdu { xsd:boolean }?,
     attribute request-apdu { xsd:boolean }?,
     attribute response-apdu { xsd:boolean }?
@@ -165,7 +169,8 @@ filter_session_shared =
   attribute name { xsd:NCName }?,
   element mp:resultset {
     attribute max { xsd:integer },
-    attribute ttl { xsd:integer }
+    attribute ttl { xsd:integer },
+    attribute optimizesearch { xsd:boolean }
   }?,
   element mp:session {
     attribute ttl { xsd:integer }
@@ -178,17 +183,21 @@ filter_sru_z3950 =
   element mp:database {  
      attribute name { xsd:NCName },
      any        
-  }+
+  }*
 
 filter_virt_db =
   attribute type { "virt_db" },
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
+  element mp:pass-vhosts { xsd:boolean }?,
+  element mp:torus {
+    attribute url { xsd:string }
+  }?,
   element mp:virtual {
     attribute route { xsd:NCName }?,
-    element mp:database { xsd:NCName },
+    element mp:database { xsd:string },
     element mp:target { xsd:string }+
-  }+
+  }*
 
 filter_z3950_client =
   attribute type { "z3950_client" },
@@ -196,7 +205,24 @@ filter_z3950_client =
   attribute name { xsd:NCName }?,
   element mp:timeout { xsd:integer }?,
   element mp:default_target { xsd:string }?,
-  element mp:force_target { xsd:string }?
+  element mp:force_target { xsd:string }?,
+  element mp:force_close { xsd:boolean }?
+
+filter_limit =
+  attribute type { "limit" },
+  element mp:limit {
+    attribute bandwidth { xsd:integer }?,
+    attribute pdu { xsd:integer }?,
+    attribute search { xsd:integer }?,
+    attribute retrieve { xsd:integer }?
+  }?
+
+filter_cgi =
+  attribute type { "cgi" },
+  element mp:map {
+    attribute path { xsd:string },
+    attribute exec { xsd:string }
+  }*
 
 #filter_zeerex_explain =
 #  attribute type { "zeerex_explain" },