X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=xml%2Fschema%2Fmetaproxy.rnc;h=509a00efcead47f8967c0c1ecc71c8b837491acc;hb=03e2fc2fbd11931ca4183c3f1fb678f09eb5403e;hp=d6b6057bb873425f5ca45bb67342cf3e85e6a1ba;hpb=451ffea184560b0d10f369dfc3fccb0fa86b91a2;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index d6b6057..509a00e 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.13 2007-01-02 15:35:36 marc Exp $
+#  $Id: metaproxy.rnc,v 1.22 2008-02-27 11:08:50 adam Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (c) 2005-2008, Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -26,6 +26,8 @@ start |= metaproxy
 
 include "retrievalinfo.rnc"
 
+any = (text | element * { attribute * { text }*, any })*
+
 metaproxy =
   element mp:metaproxy {
     attribute version { "1.0" },
@@ -48,6 +50,7 @@ filter =
     | filter_auth_simple
     | filter_backend_test
     | filter_bounce
+    | filter_cql_rpn
     | filter_frontend_net
     | filter_http_file
     | filter_load_balance
@@ -59,7 +62,7 @@ filter =
     | filter_sru_z3950
     | filter_virt_db
     | filter_z3950_client
-    | filter_zeerex_explain
+#    | filter_zeerex_explain
   }
 
 filter_refid = attribute refid { xsd:NCName }
@@ -82,12 +85,20 @@ 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:port { xsd:string }+,
   element mp:timeout { xsd:integer }?
 
 filter_http_file =
@@ -111,7 +122,10 @@ filter_log =
   attribute name { xsd:NCName }?,
   element mp:message { xsd:string }?,
   element mp:filename { xsd:string }?,
+  element mp:time-format { 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 }?,
@@ -128,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" },
@@ -151,15 +166,19 @@ 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" },
   attribute id { xsd:NCName }?,
-  attribute name { xsd:NCName }?
+  attribute name { xsd:NCName }?,
+  element mp:database {  
+     attribute name { xsd:NCName },
+     any        
+  }+
 
 filter_virt_db =
   attribute type { "virt_db" },
@@ -175,9 +194,17 @@ filter_z3950_client =
   attribute type { "z3950_client" },
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
-  element mp:timeout { xsd:integer }?
-
-filter_zeerex_explain =
-  attribute type { "zeerex_explain" },
-  attribute id { xsd:NCName }?,
-  attribute name { xsd:NCName }?
+  element mp:timeout { xsd:integer }?,
+  element mp:default_target { xsd:string }?,
+  element mp:force_target { xsd:string }?
+
+#filter_zeerex_explain =
+#  attribute type { "zeerex_explain" },
+#  attribute id { xsd:NCName }?,
+#  attribute name { xsd:NCName }?,
+#  element mp:database {  
+#     attribute name { xsd:NCName },
+#     any        
+#  }+
+
+