From e7d7386c93bd913a50ec97df2342f39f8de2bbd6 Mon Sep 17 00:00:00 2001 From: Marc Cromme 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 @@ - + @@ -14,7 +14,6 @@ - @@ -27,23 +26,10 @@ - SRU/Z3950 + SRU - VIRTDB - - - - Default - localhost:9999/Default - - - Dummy - localhost:9998/Default - - - CQL @@ -52,8 +38,15 @@ + 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