From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 16 Jun 2011 10:44:40 +0000 (+0200)
Subject: zoom: work on predefined ccl maps
X-Git-Tag: v1.2.7~15^2~1
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=d2beb20fde0f1d51e11a71ab7fac13a4da91474c;p=metaproxy-moved-to-github.git

zoom: work on predefined ccl maps
---

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 8927d79..7c88dd9 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -29,7 +29,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/ccl_xml.h>
 #include <yaz/cql.h>
 #include <yaz/oid_db.h>
 #include <yaz/diagbib1.h>
@@ -124,6 +124,7 @@ namespace metaproxy_1 {
             std::string torus_url;
             std::map<std::string,std::string> fieldmap;
             std::string xsldir;
+            CCL_bibset bibset;
         };
     }
 }
@@ -272,10 +273,12 @@ void yf::Zoom::Impl::release_frontend(mp::Package &package)
 
 yf::Zoom::Impl::Impl()
 {
+    bibset = ccl_qual_mk();
 }
 
 yf::Zoom::Impl::~Impl()
 { 
+    ccl_qual_rm(&bibset);
 }
 
 yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus(const xmlNode *ptr1)
@@ -407,6 +410,11 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
                                                        attr->name));
             }
         }
+        else if (!strcmp((const char *) ptr->name, "cclmap"))
+        {
+            const char *addinfo = 0;
+            ccl_xml_config(bibset, ptr, &addinfo);
+        }
         else if (!strcmp((const char *) ptr->name, "fieldmap"))
         {
             const struct _xmlAttr *attr;