X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rnc;h=cc3d6485805e84ccf626a0255fac678f731b30ed;hb=bddb5f0c90332a14929d25464849f23420c58a3b;hp=21908013d6d59cd6de9536300ce5c4dc8e5ceb04;hpb=e7d7386c93bd913a50ec97df2342f39f8de2bbd6;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 2190801..cc3d648 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.16 2007-01-16 09:23:24 marc Exp $
+#  $Id: metaproxy.rnc,v 1.23 2008-02-27 21:31:57 adam Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (c) 2005-2008, 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 =
@@ -121,8 +121,11 @@ 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 }?,
@@ -139,7 +142,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" },
@@ -162,10 +166,10 @@ filter_session_shared =
   element mp:resultset {
     attribute max { xsd:integer },
     attribute ttl { xsd:integer }
-  },
+  }?,
   element mp:session {
     attribute ttl { xsd:integer }
-  }
+  }?
 
 filter_sru_z3950 =
   attribute type { "sru_z3950" },
@@ -190,7 +194,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" },
@@ -201,4 +207,4 @@ filter_z3950_client =
 #     any        
 #  }+
 
- 
\ No newline at end of file
+