Implement CQL to CCL fieldmap, bug #4336

So far I have:
<fieldmap cql="cql.anywhere" ccl="term"/>
<fieldmap cql="cql.serverChoice" ccl="term"/>
<fieldmap cql="dc.creator" ccl="au"/>
<fieldmap cql="dc.title" ccl="ti"/>
<fieldmap cql="dc.subject" ccl="su"/>
<fieldmap cql="bash.isbn" ccl="isbn"/>
<fieldmap cql="bash.issn" ccl="issn"/>
<fieldmap cql="dc.date" ccl="date"/>

diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml
index 7e8c8e7..25fc86f 100644 (file)
--- a/etc/config-zoom.xml
+++ b/etc/config-zoom.xml
@@ -14,6 +14,14 @@
             url="http://newmk2.indexdata.com/torus2/searchable.ebsco/records/?query=udb%3D%db"
             xsldir="."
       />
+      <fieldmap cql="cql.anywhere" ccl="term"/>
+      <fieldmap cql="cql.serverChoice" ccl="term"/>
+      <fieldmap cql="dc.creator" ccl="au"/>
+      <fieldmap cql="dc.title" ccl="ti"/>
+      <fieldmap cql="dc.subject" ccl="su"/>
+      <fieldmap cql="bash.isbn" ccl="isbn"/>
+      <fieldmap cql="bash.issn" ccl="issn"/>
+      <fieldmap cql="dc.date" ccl="date"/>
     </filter>
   </filters>
   <routes>  
@@ -38,6 +46,7 @@
       <filter type="session_shared"/>
       <filter type="log">
         <message>B</message>
+       <category apdu="true"/>
       </filter>
       <filter refid="backend"/>
       <filter type="bounce"/>

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 82928c3..8927d79 100644 (file)
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -117,11 +117,12 @@ namespace metaproxy_1 {
             FrontendPtr get_frontend(mp::Package &package);
             void release_frontend(mp::Package &package);
             SearchablePtr parse_torus(const xmlNode *ptr);
-
+            struct cql_node *convert_cql_fields(struct cql_node *cn, ODR odr);
             std::map<mp::Session, FrontendPtr> m_clients;            
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::string torus_url;
+            std::map<std::string,std::string> fieldmap;
             std::string xsldir;
         };
     }
@@ -406,6 +407,25 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
                                                        attr->name));
             }
         }
+        else if (!strcmp((const char *) ptr->name, "fieldmap"))
+        {
+            const struct _xmlAttr *attr;
+            std::string ccl_field;
+            std::string cql_field;
+            for (attr = ptr->properties; attr; attr = attr->next)
+            {
+                if (!strcmp((const char *) attr->name, "ccl"))
+                    ccl_field = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "cql"))
+                    cql_field = mp::xml::get_text(attr->children);
+                else
+                    throw mp::filter::FilterException(
+                        "Bad attribute " + std::string((const char *)
+                                                       attr->name));
+            }
+            if (ccl_field.length() && cql_field.length())
+                fieldmap[cql_field] = ccl_field;
+        }
         else if (!strcmp((const char *) ptr->name, "records"))
         {
             yaz_log(YLOG_WARN, "records ignored!");
@@ -702,6 +722,35 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
     return records;
 }
     
+struct cql_node *yf::Zoom::Impl::convert_cql_fields(struct cql_node *cn,
+                                                    ODR odr)
+{
+    struct cql_node *r = 0;
+    if (!cn)
+        return 0;
+    switch (cn->which)
+    {
+    case CQL_NODE_ST:
+        if (cn->u.st.index)
+        {
+            std::map<std::string,std::string>::const_iterator it;
+            it = fieldmap.find(cn->u.st.index);
+            if (it == fieldmap.end())
+                return cn;
+            cn->u.st.index = odr_strdup(odr, it->second.c_str());
+        }
+        break;
+    case CQL_NODE_BOOL:
+        r = convert_cql_fields(cn->u.boolean.left, odr);
+        if (!r)
+            r = convert_cql_fields(cn->u.boolean.right, odr);
+        break;
+    case CQL_NODE_SORT:
+        r = convert_cql_fields(cn->u.sort.search, odr);
+        break;
+    }
+    return r;
+}
 
 void yf::Zoom::Frontend::handle_search(mp::Package &package)
 {
@@ -769,6 +818,21 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
             return;
         }
         struct cql_node *cn = cql_parser_result(cp);
+        struct cql_node *cn_error = m_p->convert_cql_fields(cn, odr);
+        if (cn_error)
+        {
+            // hopefully we are getting a ptr to a index+relation+term node
+            addinfo = 0;
+            if (cn_error->which == CQL_NODE_ST)
+                addinfo = cn_error->u.st.index;
+
+            apdu_res = 
+                odr.create_searchResponse(apdu_req, 
+                                          YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+                                          addinfo);
+            package.response() = apdu_res;
+            return;
+        }
         char ccl_buf[1024];
 
         r = cql_to_ccl_buf(cn, ccl_buf, sizeof(ccl_buf));