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

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index d6b6057..2190801 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,5 +1,5 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.13 2007-01-02 15:35:36 marc Exp $
+#  $Id: metaproxy.rnc,v 1.16 2007-01-16 09:23:24 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -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,6 +85,14 @@ 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 }?,
@@ -159,7 +170,11 @@ filter_session_shared =
 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" },
@@ -177,7 +192,13 @@ filter_z3950_client =
   attribute name { xsd:NCName }?,
   element mp:timeout { xsd:integer }?
 
-filter_zeerex_explain =
-  attribute type { "zeerex_explain" },
-  attribute id { xsd:NCName }?,
-  attribute name { xsd:NCName }?
+#filter_zeerex_explain =
+#  attribute type { "zeerex_explain" },
+#  attribute id { xsd:NCName }?,
+#  attribute name { xsd:NCName }?,
+#  element mp:database {  
+#     attribute name { xsd:NCName },
+#     any        
+#  }+
+
+ 
\ No newline at end of file