X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rnc;h=6efeeae03ff67a2d0e17b0d04e680edbaa075099;hb=22c667c95a48e77eef00bb5a96f4664c92f0940c;hp=f517a8f62298e1014617b2cfcf42e63f6c81db23;hpb=c7fc502c6791a52ec448deeaae9a4373eec79d69;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index f517a8f..6efeeae 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.19 2007-02-06 13:28:08 marc Exp $
 # 
-#   Copyright (c) 2005-2007, Index Data.
+#   Copyright (c) 2005-2008 Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -121,8 +120,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 +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" },