X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_record_transform.cpp;h=e3b1dd7949a44d395379aa3d2f519e722cd7f159;hb=4fabbaa1f81fc6f5dabd8444a000d6a0020e85f7;hp=7449ab5980e9d02d01d65cf746f225f077d6ab4f;hpb=0ab6e8aba7de1ea5cf109de175f56c9d8f7f49bc;p=metaproxy-moved-to-github.git

diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp
index 7449ab5..e3b1dd7 100644
--- a/src/filter_record_transform.cpp
+++ b/src/filter_record_transform.cpp
@@ -1,7 +1,5 @@
-/* $Id: filter_record_transform.cpp,v 1.13 2007-12-16 22:22:49 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2012 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,25 +12,20 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
-#include "filter.hpp"
 #include "filter_record_transform.hpp"
-#include "package.hpp"
-#include "util.hpp"
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
 #include "gduutil.hpp"
-#include "xmlutil.hpp"
 
 #include <yaz/diagbib1.h>
 #include <yaz/zgdu.h>
 #include <yaz/retrieval.h>
 
-//#include <boost/thread/mutex.hpp>
-
 #include <iostream>
 
 namespace mp = metaproxy_1;
@@ -46,7 +39,7 @@ namespace metaproxy_1 {
             Impl();
             ~Impl();
             void process(metaproxy_1::Package & package) const;
-            void configure(const xmlNode * xml_node);
+            void configure(const xmlNode * xml_node, const char *path);
         private:
             yaz_retrieval_t m_retrieval;
         };
@@ -63,9 +56,10 @@ yf::RecordTransform::~RecordTransform()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::RecordTransform::configure(const xmlNode *xmlnode)
+void yf::RecordTransform::configure(const xmlNode *xmlnode, bool test_only,
+                                    const char *path)
 {
-    m_p->configure(xmlnode);
+    m_p->configure(xmlnode, path);
 }
 
 void yf::RecordTransform::process(mp::Package &package) const
@@ -90,11 +84,10 @@ yf::RecordTransform::Impl::~Impl()
         yaz_retrieval_destroy(m_retrieval);
 }
 
-void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
+void yf::RecordTransform::Impl::configure(const xmlNode *xml_node,
+                                          const char *path)
 {
-    //const char *srcdir = getenv("srcdir");
-    //if (srcdir)
-    //    yaz_retrieval_set_path(m_retrieval, srcdir);
+    yaz_retrieval_set_path(m_retrieval, path);
 
     if (!xml_node)
         throw mp::XMLError("RecordTransform filter config: empty XML DOM");
@@ -112,7 +105,8 @@ void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
     }
 
     // read configuration
-    if ( 0 != yaz_retrieval_configure(m_retrieval, retrieval_node)){
+    if (0 != yaz_retrieval_configure(m_retrieval, retrieval_node))
+    {
         std::string msg("RecordTransform filter config: ");
         msg += yaz_retrieval_get_error(m_retrieval);
         throw mp::XMLError(msg);
@@ -147,11 +141,13 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const
     const char *input_schema = 0;
     Odr_oid *input_syntax = 0;
 
-    if(pr_req->recordComposition){
+    if (pr_req->recordComposition)
+    {
         input_schema 
             = mp_util::record_composition_to_esn(pr_req->recordComposition);
     }
-    if(pr_req->preferredRecordSyntax){
+    if (pr_req->preferredRecordSyntax)
+    {
         input_syntax = pr_req->preferredRecordSyntax;
     }
     
@@ -240,7 +236,6 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const
         || !gdu_res->u.z3950->u.presentResponse)
 
     {
-        std::cout << "record-transform: error back present\n";
         package.session().close();
         return;
     }
@@ -345,8 +340,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+