Change target profile parameter CfSubDb to CfSubDB

diff --git a/doc/zoom.xml b/doc/zoom.xml
index 4835356..2c85515 100644 (file)
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -332,7 +332,7 @@
    </varlistentry>
 
    <varlistentry>
-    <term>cfSubDb</term><listitem>
+    <term>cfSubDB</term><listitem>
     <para>
      Specifies sub database for a Connector Framework based target.
     </para>

diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml
index 4d2e555..f0fa876 100644 (file)
--- a/etc/config-zoom.xml
+++ b/etc/config-zoom.xml
@@ -173,7 +173,7 @@
            <zurl>localhost:9999/db01</zurl>
            <cfAuth>cfuser/cfpassword</cfAuth>
            <cfProxy>localhost:3128</cfProxy>
-           <cfSubDb>mysub</cfSubDb>
+           <cfSubDB>mysub</cfSubDB>
          </record>
        </records>
       </torus>

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index b0597ce..914cde3 100644 (file)
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -59,7 +59,7 @@ namespace metaproxy_1 {
             std::string authentication;
             std::string cfAuth;
             std::string cfProxy;
-            std::string cfSubDb;
+            std::string cfSubDB;
             std::string udb;
             std::string target;
             std::string query_encoding;
@@ -404,9 +404,9 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
             s->cfProxy = mp::xml::get_text(ptr);
         }  
         else if (!strcmp((const char *) ptr->name,
-                         "cfSubDb"))
+                         "cfSubDB"))
         {
-            s->cfSubDb = mp::xml::get_text(ptr);
+            s->cfSubDB = mp::xml::get_text(ptr);
         }  
         else if (!strcmp((const char *) ptr->name,
                          "contentConnector"))
@@ -892,10 +892,10 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             out_names[no_out_args] = "proxy";
             out_values[no_out_args++] = odr_strdup(odr, proxy.c_str());
         }
-        if (sptr->cfSubDb.length())
+        if (sptr->cfSubDB.length())
         {
             out_names[no_out_args] = "subdatabase";
-            out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDb.c_str());
+            out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDB.c_str());
         }
     }
     else

diff --git a/xml/schema/filter_zoom.rnc b/xml/schema/filter_zoom.rnc
index 679eade..64cd178 100644 (file)
--- a/xml/schema/filter_zoom.rnc
+++ b/xml/schema/filter_zoom.rnc
@@ -35,7 +35,7 @@ filter_zoom =
         element mp:zurl { xsd:string },
         element mp:cfAuth { xsd:string }?,
         element mp:cfProxy { xsd:string }?,
-        element mp:cfSubDb { xsd:string }?,
+        element mp:cfSubDB { xsd:string }?,
         element mp:contentConnector { xsd:string }?,
         element mp:sortStrategy { xsd:string }?,
         element mp:sortmap_author { xsd:string }?,