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

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 023b4f2..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.8 2006-11-29 14:49:20 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
 # 
@@ -22,13 +22,15 @@
 
 namespace mp = "http://indexdata.com/metaproxy"
 
+start |= metaproxy
+
 include "retrievalinfo.rnc"
 
-start = metaproxy
+any = (text | element * { attribute * { text }*, any })*
 
 metaproxy =
   element mp:metaproxy {
-    attribute version { xsd:float },
+    attribute version { "1.0" },
     element mp:start {
             attribute route { xsd:NCName }
     },
@@ -48,8 +50,10 @@ filter =
     | filter_auth_simple
     | filter_backend_test
     | filter_bounce
+    | filter_cql_rpn
     | filter_frontend_net
     | filter_http_file
+    | filter_load_balance
     | filter_log
     | filter_multi
     | filter_query_rewrite
@@ -58,6 +62,7 @@ filter =
     | filter_sru_z3950
     | filter_virt_db
     | filter_z3950_client
+#    | filter_zeerex_explain
   }
 
 filter_refid = attribute refid { xsd:NCName }
@@ -80,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 =
@@ -98,13 +111,21 @@ filter_http_file =
     element mp:prefix { xsd:string }
   }
 
+filter_load_balance =
+  attribute type { "load_balance" },
+  attribute id { xsd:NCName }?,
+  attribute name { xsd:NCName }?
+
 filter_log =
   attribute type { "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 }?,
@@ -121,13 +142,16 @@ 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" },
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
-  element mp:xslt { xsd:string }
+  element mp:xslt { 
+        attribute stylesheet { xsd:string }
+  }
 
 filter_record_transform =
   attribute type { "record_transform" },
@@ -142,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" },
@@ -166,4 +194,17 @@ 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" },
+#  attribute id { xsd:NCName }?,
+#  attribute name { xsd:NCName }?,
+#  element mp:database {  
+#     attribute name { xsd:NCName },
+#     any        
+#  }+
+
+