From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 6 Dec 2011 13:42:21 +0000 (+0100)
Subject: SRUVersion -> sruVersion
X-Git-Tag: v1.3.18~10
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=48303fd661d8987d0ad1211180b36cd7c2484d46;p=metaproxy-moved-to-github.git

SRUVersion -> sruVersion

SRUVersion is still accepted in code but not in schema.
---

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 @@
    </varlistentry>
 
    <varlistentry>
-    <term>SRUVersion</term><listitem>
+    <term>sruVersion</term><listitem>
     <para>
      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 @@
 	    <cclmap_term>s=al</cclmap_term>
 	    <cclmap_ti>1=title s=pw t=l,r</cclmap_ti>
 	    <sru>get</sru>
-	    <SRUVersion>1.1</SRUVersion>
+	    <sruVersion>1.1</sruVersion>
 	    <transform>tmarc.xsl</transform>
 	    <zurl>localhost:9998/db01</zurl>
             <sortStrategy>embed</sortStrategy>
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 }?,