From e7d7386c93bd913a50ec97df2342f39f8de2bbd6 Mon Sep 17 00:00:00 2001
From: Marc Cromme <marc@indexdata.dk>
Date: Tue, 16 Jan 2007 09:23:24 +0000
Subject: [PATCH] updated XML RelaxNG schema with filter 'cql_rpn' section
 simplified SRU server config file

---
 etc/config-sru-to-z3950.xml |   25 +++++++++----------------
 xml/schema/metaproxy.rnc    |   11 ++++++++++-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/etc/config-sru-to-z3950.xml b/etc/config-sru-to-z3950.xml
index aa194db..3c6a527 100644
--- a/etc/config-sru-to-z3950.xml
+++ b/etc/config-sru-to-z3950.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config-sru-to-z3950.xml,v 1.13 2007-01-15 15:07:59 marc Exp $ -->
+<!-- $Id: config-sru-to-z3950.xml,v 1.14 2007-01-16 09:23:24 marc Exp $ -->
 <metaproxy 
     xmlns="http://indexdata.com/metaproxy" 
     version="1.0">
@@ -14,7 +14,6 @@
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
                     href="explain.xml"/>
       </database>
-      <database name="Dummy"/>
     </filter>
       <filter id="cql" type="cql_rpn">
         <conversion file="etc/cql2pqf.txt"/>
@@ -27,23 +26,10 @@
     <route id="start">
       <filter refid="frontend"/>
       <filter type="log">
-        <message>SRU/Z3950</message>
+        <message>SRU</message>
       </filter>
       <filter refid="sru"/>
       <filter type="log">
-        <message>VIRTDB</message>
-      </filter>
-     <filter type="virt_db">
-        <virtual>
-          <database>Default</database>
-          <target>localhost:9999/Default</target>
-        </virtual>
-        <virtual>
-          <database>Dummy</database>
-          <target>localhost:9998/Default</target>
-        </virtual>
-      </filter>
-      <filter type="log">
         <message>CQL</message>
       </filter>
       <filter refid="cql"/>
@@ -52,8 +38,15 @@
       </filter>
       <filter type="backend_test"/>
       <!--
+      <filter type="virt_db">
+        <virtual>
+          <database>Default</database>
+          <target>localhost:9999/Default</target>
+        </virtual>
+      </filter>
       <filter refid="backend"/>
       -->
+
       <filter type="bounce"/>
     </route>
   </routes>
diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 9f49097..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.15 2007-01-08 13:07:39 marc Exp $
+#  $Id: metaproxy.rnc,v 1.16 2007-01-16 09:23:24 marc 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
@@ -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 }?,
-- 
1.7.10.4