From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 9 Jun 2011 10:52:11 +0000 (+0200)
Subject: zoom filter: honor cclmap_*-fields
X-Git-Tag: v1.2.6~16
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=a48de5fe67ddff23e96fe9f02318e6d4123719a8;p=metaproxy-moved-to-github.git

zoom filter: honor cclmap_*-fields

CCL parsing will be performed for CCL queries in Z39.50 (Type-2).
---

diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml
index 56dfaba..05002a2 100644
--- a/etc/config-zoom.xml
+++ b/etc/config-zoom.xml
@@ -21,6 +21,10 @@
 	     <requestSyntax>MARC21</requestSyntax>
 	     <recordEncoding>MARC-8</recordEncoding>
 	     <transform>tmarc.xsl</transform>
+             <cclmap_term>u=1016 2=3 3=3 s=al s=pw t=l,r 6=1</cclmap_term>
+             <cclmap_au>u=1003 2=3 s=al s=pw t=l,r 6=1</cclmap_au>
+             <cclmap_ti>u=4 2=3 3=3 s=al s=pw t=l,r 6=1</cclmap_ti>
+             <cclmap_su>u=21 2=3 3=3 s=al s=pw t=l,r 6=1</cclmap_su>
            </layer>
          </record>
          <record>
diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index b304074..ea3df01 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
+#include <yaz/ccl.h>
 #include <yaz/oid_db.h>
 #include <yaz/diagbib1.h>
 #include <yaz/log.h>
@@ -50,6 +51,7 @@ namespace metaproxy_1 {
             std::string transform_xsl_fname;
             bool use_turbomarc;
             bool piggyback;
+            CCL_bibset ccl_bibset;
             Searchable();
             ~Searchable();
         };
@@ -147,6 +149,7 @@ yf::Zoom::Backend::Backend(SearchablePtr ptr) : sptr(ptr)
 {
     m_connection = ZOOM_connection_create(0);
     m_resultset = 0;
+    xsp = 0;
 }
 
 yf::Zoom::Backend::~Backend()
@@ -199,10 +202,12 @@ yf::Zoom::Searchable::Searchable()
 {
     piggyback = true;
     use_turbomarc = false;
+    ccl_bibset = ccl_qual_mk();
 }
 
 yf::Zoom::Searchable::~Searchable()
 {
+    ccl_qual_rm(&ccl_bibset);
 }
 
 yf::Zoom::Frontend::Frontend(Impl *impl) : 
@@ -342,6 +347,13 @@ void yf::Zoom::Impl::parse_torus(const xmlNode *ptr1)
                                     s->use_turbomarc ? "1" : "0");
                                     
                         }
+                        else if (!strncmp((const char *) ptr3->name,
+                                          "cclmap_", 7))
+                        {
+                            std::string value = mp::xml::get_text(ptr3);
+                            ccl_qual_fitem(s->ccl_bibset, value.c_str(),
+                                           (const char *) ptr3->name + 7);
+                        }
                     }
                     if (s->database.length() && s->target.length())
                     {
@@ -676,10 +688,42 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
     Z_Query *query = sr->query;
     if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101)
     {
+        // RPN
         WRBUF w = wrbuf_alloc();
         yaz_rpnquery_to_wrbuf(w, query->u.type_1);
 
         b->search_pqf(wrbuf_cstr(w), &hits, &error, &addinfo);
+
+        wrbuf_destroy(w);
+    }
+    else if (query->which == Z_Query_type_2)
+    {
+        // CCL
+        WRBUF w = wrbuf_alloc();
+        wrbuf_write(w, (const char *) query->u.type_2->buf,
+                    query->u.type_2->len);
+        int cerror, cpos;
+        struct ccl_rpn_node *cn;
+        cn = ccl_find_str(b->sptr->ccl_bibset, wrbuf_cstr(w), &cerror, &cpos);
+        wrbuf_destroy(w);
+
+        if (!cn)
+        {
+            char *addinfo = odr_strdup(odr, ccl_err_msg(cerror));
+
+            apdu_res = 
+                odr.create_searchResponse(apdu_req, 
+                                          YAZ_BIB1_MALFORMED_QUERY,
+                                          addinfo);
+            package.response() = apdu_res;
+            return;
+        }
+        w = wrbuf_alloc();
+        ccl_pquery(w, cn);
+        
+        b->search_pqf(wrbuf_cstr(w), &hits, &error, &addinfo);
+        
+        ccl_rpn_delete(cn);
         wrbuf_destroy(w);
     }
     else