X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=577e2b147beffb49d6ac27674fd45e98c1b5c63d;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=bab4687672a8c2b10408dd5d0f15041036d3f7bc;hpb=b54482cdb759f092fcd07a9be4fdc8c28009b895;p=metaproxy-moved-to-github.git

diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp
index bab4687..577e2b1 100644
--- a/src/filter_backend_test.cpp
+++ b/src/filter_backend_test.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_backend_test.cpp,v 1.5 2005-10-26 18:53:49 adam Exp $
+/* $Id: filter_backend_test.cpp,v 1.10 2005-11-10 23:10:42 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -9,20 +9,21 @@
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
+#include "util.hpp"
+#include "filter_backend_test.hpp"
 
-#include <boost/thread/mutex.hpp>
+#include <stdexcept>
+#include <list>
+#include <map>
+#include <iostream>
 
-#include "filter_backend_test.hpp"
+#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 {
@@ -41,13 +42,13 @@ namespace yp2 {
     }
 }
 
-yf::Backend_test::Backend_test() {
-    m_p = new Backend_test::Rep;
+using namespace yp2;
+
+yf::Backend_test::Backend_test() : m_p(new Backend_test::Rep) {
     m_p->m_support_named_result_sets = false;
 }
 
 yf::Backend_test::~Backend_test() {
-    delete m_p;
 }
 
 void yf::Backend_test::process(Package &package) const
@@ -60,16 +61,13 @@ void yf::Backend_test::process(Package &package) const
     {
         Z_APDU *apdu_req = gdu->u.z3950;
         Z_APDU *apdu_res = 0;
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::odr odr;
         
         if (apdu_req->which != Z_APDU_initRequest && 
             !m_p->m_sessions.exist(package.session()))
         {
-            apdu_res = zget_APDU(odr, Z_APDU_close);            
-            *apdu_res->u.close->closeReason = Z_Close_protocolError;
-            apdu_res->u.close->diagnosticInformation =
-                odr_strdup(odr, "no init for filter_backend_test");
-            
+            apdu_res = odr.create_close(Z_Close_protocolError,
+                                        "no init for filter_backend_test");
             package.session().close();
         }
         else if (apdu_req->which == Z_APDU_initRequest)
@@ -133,16 +131,12 @@ void yf::Backend_test::process(Package &package) const
         }
         else
         {
-            apdu_res = zget_APDU(odr, Z_APDU_close);            
-            *apdu_res->u.close->closeReason = Z_Close_protocolError;
-            apdu_res->u.close->diagnosticInformation =
-                odr_strdup(odr, "bad APDU in filter_backend_test");
-            
+            apdu_res = odr.create_close(Z_Close_protocolError,
+                                        "bad APDU in filter_backend_test");
             package.session().close();
         }
         if (apdu_res)
             package.response() = apdu_res;
-        odr_destroy(odr);
     }
     if (package.session().is_closed())
         m_p->m_sessions.release(package.session());