X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rnc;h=2eccb008bf9657cb9265ab84b8530a6eaa635a43;hb=1b26df87d5244f5bc093935dedd51cbf6858c703;hp=9f49097ea2df064ea445b989618b2f47f988039b;hpb=9257766cd43b17520940b4343bf77a74a7d3776a;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 9f49097..2eccb00 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,7 +1,6 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.15 2007-01-08 13:07:39 marc Exp $
 # 
-#   Copyright (c) 2005-2006, 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 }
     },
@@ -50,8 +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
@@ -84,13 +87,22 @@ filter_bounce =
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?
 
+filter_cql_rpn =
+  attribute type { "cql_rpn" },
+  attribute id { xsd:NCName }?,
+  attribute name { xsd:NCName }?,
+  element mp:conversion {
+    attribute  file { xsd:string }
+  }
+
 filter_frontend_net =
   attribute type { "frontend_net" },
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
   element mp:threads { xsd:integer }?,
-  element mp:port { xsd:string },
-  element mp:timeout { xsd:integer }?
+  element mp:port { xsd:string }+,
+  element mp:timeout { xsd:integer }?,
+  element mp:connect-max { xsd:integer }?
 
 filter_http_file =
   attribute type { "http_file" },
@@ -112,11 +124,15 @@ 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 }?,
+    attribute access { xsd:boolean }?,
     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 }?
@@ -130,7 +146,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" },
@@ -152,11 +169,12 @@ 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 }
-  }
+  }?
 
 filter_sru_z3950 =
   attribute type { "sru_z3950" },
@@ -165,15 +183,16 @@ 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 },
+    element mp:database { xsd:string },
     element mp:target { xsd:string }+
   }+
 
@@ -181,7 +200,26 @@ filter_z3950_client =
   attribute type { "z3950_client" },
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
-  element mp:timeout { xsd:integer }?
+  element mp:timeout { xsd:integer }?,
+  element mp:default_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" },
@@ -192,4 +230,4 @@ filter_z3950_client =
 #     any        
 #  }+
 
- 
\ No newline at end of file
+