From 48303fd661d8987d0ad1211180b36cd7c2484d46 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 6 Dec 2011 14:42:21 +0100 Subject: [PATCH] SRUVersion -> sruVersion SRUVersion is still accepted in code but not in schema. --- doc/zoom.xml | 2 +- etc/config-zoom.xml | 2 +- src/filter_zoom.cpp | 3 ++- xml/schema/filter_zoom.rnc | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/zoom.xml b/doc/zoom.xml index e9f44fd..d8ae9e2 100644 --- a/doc/zoom.xml +++ b/doc/zoom.xml @@ -470,7 +470,7 @@ - SRUVersion + sruVersion Specifies the SRU version to use. It unset, version 1.2 will be used. Some servers do not support this version, in which case diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml index 9d1c713..d457e72 100644 --- a/etc/config-zoom.xml +++ b/etc/config-zoom.xml @@ -45,7 +45,7 @@ s=al 1=title s=pw t=l,r get - 1.1 + 1.1 tmarc.xsl localhost:9998/db01 embed diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index d6a8cdc..abd000b 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -436,7 +436,8 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) { s->sru = mp::xml::get_text(ptr); } - else if (!strcmp((const char *) ptr->name, "SRUVersion")) + else if (!strcmp((const char *) ptr->name, "SRUVersion") || + !strcmp((const char *) ptr->name, "sruVersion")) { s->sru_version = mp::xml::get_text(ptr); } diff --git a/xml/schema/filter_zoom.rnc b/xml/schema/filter_zoom.rnc index 3480061..9140539 100644 --- a/xml/schema/filter_zoom.rnc +++ b/xml/schema/filter_zoom.rnc @@ -29,7 +29,7 @@ filter_zoom = element mp:recordEncoding { xsd:string }?, element mp:requestSyntax { xsd:string }?, element mp:sru { xsd:string }?, - element mp:SRUVersion { xsd:string }?, + element mp:sruVersion { xsd:string }?, element mp:transform { xsd:string }?, element mp:literalTransform { xsd:string }?, element mp:urlRecipe { xsd:string }?, -- 1.7.10.4