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

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 340221f..7759cf5 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.14 2007-01-05 11:28:48 marc Exp $
+#  $Id: metaproxy.rnc,v 1.17 2007-01-25 11:21:56 adam Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -50,6 +50,7 @@ filter =
     | filter_auth_simple
     | filter_backend_test
     | filter_bounce
+    | filter_cql_rpn
     | filter_frontend_net
     | filter_http_file
     | filter_load_balance
@@ -61,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 }
@@ -84,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 }?,
@@ -153,15 +162,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" },
@@ -179,13 +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 }?,
-  element mp:database {  
-     attribute name { xsd:NCName },
-     any        
-  }+
+#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
+