X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=84b472030a33cc02466c22a11d27f66971e77bf2;hb=a1ef872694c141f21afdbb3e0798b60fc1421429;hp=998e69ea1e8d57637ed7e3b16ed2a94c0dd44fdb;hpb=93d4dd6d4f9698c7aaa74cadb343a2da8ef8ff5a;p=metaproxy-moved-to-github.git

diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp
index 998e69e..84b4720 100644
--- a/src/filter_backend_test.cpp
+++ b/src/filter_backend_test.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_backend_test.cpp,v 1.8 2005-10-30 18:51:20 adam Exp $
+/* $Id: filter_backend_test.cpp,v 1.15 2006-01-17 13:54:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -7,23 +7,22 @@
 #include "config.hpp"
 
 #include "filter.hpp"
-#include "router.hpp"
 #include "package.hpp"
-
-#include <boost/thread/mutex.hpp>
-
 #include "util.hpp"
 #include "filter_backend_test.hpp"
 
+#include <stdexcept>
+#include <list>
+#include <map>
+#include <iostream>
+
+#include <boost/thread/mutex.hpp>
+
 #include <yaz/zgdu.h>
 #include <yaz/log.h>
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 
-#include <list>
-#include <map>
-#include <iostream>
-
 namespace yf = yp2::filter;
 
 namespace yp2 {
@@ -42,6 +41,8 @@ namespace yp2 {
     }
 }
 
+using namespace yp2;
+
 yf::Backend_test::Backend_test() : m_p(new Backend_test::Rep) {
     m_p->m_support_named_result_sets = false;
 }
@@ -64,13 +65,14 @@ void yf::Backend_test::process(Package &package) const
         if (apdu_req->which != Z_APDU_initRequest && 
             !m_p->m_sessions.exist(package.session()))
         {
-            apdu_res = odr.create_close(Z_Close_protocolError,
+            apdu_res = odr.create_close(apdu_req,
+                                        Z_Close_protocolError,
                                         "no init for filter_backend_test");
             package.session().close();
         }
         else if (apdu_req->which == Z_APDU_initRequest)
         {
-            apdu_res = zget_APDU(odr, Z_APDU_initResponse);
+            apdu_res = odr.create_initResponse(apdu_req, 0, 0);
             Z_InitRequest *req = apdu_req->u.initRequest;
             Z_InitResponse *resp = apdu_res->u.initResponse;
             
@@ -105,7 +107,7 @@ void yf::Backend_test::process(Package &package) const
         }
         else if (apdu_req->which == Z_APDU_searchRequest)
         {
-            apdu_res = zget_APDU(odr, Z_APDU_searchResponse);
+            apdu_res = odr.create_searchResponse(apdu_req, 0, 0);
             Z_SearchRequest *req = apdu_req->u.searchRequest;
             Z_SearchResponse *resp = apdu_res->u.searchResponse;
                 
@@ -125,12 +127,17 @@ void yf::Backend_test::process(Package &package) const
         }
         else if (apdu_req->which == Z_APDU_presentRequest)
         { 
-            apdu_res = zget_APDU(odr, Z_APDU_presentResponse);
+            apdu_res =
+                odr.create_presentResponse(
+                    apdu_req,
+                    YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+                    "backend_test: present not implemented");
         }
         else
         {
-            apdu_res = odr.create_close(Z_Close_protocolError,
-                                        "bad APDU in filter_backend_test");
+            apdu_res = odr.create_close(apdu_req,
+                                        Z_Close_protocolError,
+                                        "backend_test: unhandled APDU");
             package.session().close();
         }
         if (apdu_res)
@@ -140,6 +147,19 @@ void yf::Backend_test::process(Package &package) const
         m_p->m_sessions.release(package.session());
 }
 
+static yp2::filter::Base* filter_creator()
+{
+    return new yp2::filter::Backend_test;
+}
+
+extern "C" {
+    struct yp2_filter_struct yp2_filter_backend_test = {
+        0,
+        "backend_test",
+        filter_creator
+    };
+}
+
 
 /*
  * Local variables: