X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rnc;h=2cb8e7703d733423877cff297411bf810e387896;hb=170cc497cb0177ed961d9dc1be7311c832b2ded9;hp=7759cf50de7baa31d79e31beb00a57b8e24f7538;hpb=c633a2400b668e3c7a5c2e6322154f7fe77263e2;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 7759cf5..2cb8e77 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,7 +1,7 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.17 2007-01-25 11:21:56 adam Exp $
+#  $Id: metaproxy.rnc,v 1.21 2007-11-18 10:44:40 adam Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (c) 2005-2007, Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -98,7 +98,7 @@ filter_frontend_net =
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
   element mp:threads { xsd:integer }?,
-  element mp:port { xsd:string },
+  element mp:port { xsd:string }+,
   element mp:timeout { xsd:integer }?
 
 filter_http_file =
@@ -123,6 +123,8 @@ filter_log =
   element mp:message { 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 }?,
@@ -139,7 +141,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" },
@@ -190,7 +193,9 @@ 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 }?
 
 #filter_zeerex_explain =
 #  attribute type { "zeerex_explain" },