From 711c44d391e9c27567f0716d63be30c5769ed15d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 8 Jul 2009 14:29:23 +0200 Subject: [PATCH] Modify schema for sru_z3950 (database? -> database*) For sru_z3950, database elements in sru_z3950 is zero or more rather than one or more. Sort filters in schema. --- xml/schema/metaproxy.rnc | 4 ++-- xml/schema/metaproxy.rng | 6 +++--- xml/schema/metaproxy.xsd | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc index 6e1aabb..8711820 100644 --- a/xml/schema/metaproxy.rnc +++ b/xml/schema/metaproxy.rnc @@ -53,6 +53,7 @@ filter = | filter_cql_rpn | filter_frontend_net | filter_http_file + | filter_limit | filter_load_balance | filter_log | filter_multi @@ -62,7 +63,6 @@ filter = | filter_sru_z3950 | filter_virt_db | filter_z3950_client - | filter_limit # | filter_zeerex_explain } @@ -180,7 +180,7 @@ filter_sru_z3950 = element mp:database { attribute name { xsd:NCName }, any - }+ + }* filter_virt_db = attribute type { "virt_db" }, diff --git a/xml/schema/metaproxy.rng b/xml/schema/metaproxy.rng index 54c54fc..4f59d79 100644 --- a/xml/schema/metaproxy.rng +++ b/xml/schema/metaproxy.rng @@ -90,6 +90,7 @@ + @@ -99,7 +100,6 @@ - @@ -454,14 +454,14 @@ - + - + diff --git a/xml/schema/metaproxy.xsd b/xml/schema/metaproxy.xsd index 1869052..7fbd314 100644 --- a/xml/schema/metaproxy.xsd +++ b/xml/schema/metaproxy.xsd @@ -79,6 +79,7 @@ + @@ -87,7 +88,6 @@ - @@ -98,6 +98,7 @@ + @@ -107,7 +108,6 @@ - @@ -378,7 +378,7 @@ - + -- 1.7.10.4