Modify schema for sru_z3950 (database? -> database*)

[metaproxy-moved-to-github.git] / xml / schema / metaproxy.rnc

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index ca76f45..8711820 100644 (file)
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,7 +1,6 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.20 2007-05-23 06:53:00 adam Exp $
 # 
-#   Copyright (c) 2005-2007, Index Data.
+#   Copyright (c) 2005-2008 Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -31,6 +30,7 @@ any = (text | element * { attribute * { text }*, any })*
 metaproxy =
   element mp:metaproxy {
     attribute version { "1.0" },
+    element mp:dlpath { xsd:string }?,
     element mp:start {
             attribute route { xsd:NCName }
     },
@@ -53,6 +53,7 @@ filter =
     | filter_cql_rpn
     | filter_frontend_net
     | filter_http_file
+    | filter_limit
     | filter_load_balance
     | filter_log
     | filter_multi
@@ -99,7 +100,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" },
@@ -121,6 +123,7 @@ filter_log =
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
   element mp:message { xsd:string }?,
+  element mp:time-format { xsd:string }?,
   element mp:filename { xsd:string }?,
   element mp:category {
     attribute user-access { xsd:boolean }?,
@@ -141,7 +144,8 @@ filter_multi =
     attribute route { xsd:string },
     xsd:string
   }*,
-  element mp:hideunavailable { empty }?
+  element mp:hideunavailable { empty }?,
+  element mp:mergetype { xsd:string }?
 
 filter_query_rewrite =
   attribute type { "query_rewrite" },
@@ -176,12 +180,13 @@ 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:virtual {
     attribute route { xsd:NCName }?,
     element mp:database { xsd:NCName },
@@ -196,6 +201,15 @@ filter_z3950_client =
   element mp:default_target { xsd:string }?,
   element mp:force_target { xsd:string }?
 
+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_zeerex_explain =
 #  attribute type { "zeerex_explain" },
 #  attribute id { xsd:NCName }?,