X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=e7d222fb4e71b6c3a0dad06f5e84a86eaa6cddc2;hb=bb895b8ee8140a706435f3be5e20aa681595485b;hp=1f60334d88523e2fc867ee7be6c190b5b20e3200;hpb=be83c640396e23420206a204eb78d353aedede05;p=metaproxy-moved-to-github.git

diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp
index 1f60334..e7d222f 100644
--- a/src/filter_backend_test.cpp
+++ b/src/filter_backend_test.cpp
@@ -1,7 +1,7 @@
-/* $Id: filter_backend_test.cpp,v 1.16 2006-01-17 16:45:49 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_backend_test.cpp,v 1.20 2006-09-28 11:56:54 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -23,15 +23,17 @@
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
+using namespace mp;
 
-namespace yp2 {
+namespace metaproxy_1 {
     namespace filter {
         class Session_info {
             int dummy;
         };
-        class Backend_test::Rep {
-            friend class Backend_test;
+        class BackendTest::Rep {
+            friend class BackendTest;
 
             Z_Records *fetch(
                 ODR odr, Odr_oid *preferredRecordSyntax,
@@ -45,7 +47,6 @@ namespace yp2 {
     }
 }
 
-using namespace yp2;
 
 static const int result_set_size = 42;
 
@@ -76,14 +77,14 @@ static const char *marc_record =
   "\x20\x20\x20\x31\x31\x32\x32\x34\x34\x36\x36\x20\x1E\x1D";
 
 
-yf::Backend_test::Backend_test() : m_p(new Backend_test::Rep) {
+yf::BackendTest::BackendTest() : m_p(new BackendTest::Rep) {
     m_p->m_support_named_result_sets = false;
 }
 
-yf::Backend_test::~Backend_test() {
+yf::BackendTest::~BackendTest() {
 }
 
-Z_Records *yf::Backend_test::Rep::fetch(
+Z_Records *yf::BackendTest::Rep::fetch(
     ODR odr, Odr_oid *preferredRecordSyntax,
     int start, int number, int &error_code, std::string &addinfo,
     int *number_returned, int *next_position)
@@ -143,7 +144,7 @@ Z_Records *yf::Backend_test::Rep::fetch(
     return rec;
 }
 
-void yf::Backend_test::process(Package &package) const
+void yf::BackendTest::process(Package &package) const
 {
     Z_GDU *gdu = package.request().get();
 
@@ -153,7 +154,7 @@ void yf::Backend_test::process(Package &package) const
     {
         Z_APDU *apdu_req = gdu->u.z3950;
         Z_APDU *apdu_res = 0;
-        yp2::odr odr;
+        mp::odr odr;
         
         if (apdu_req->which != Z_APDU_initRequest && 
             !m_p->m_sessions.exist(package.session()))
@@ -214,30 +215,19 @@ void yf::Backend_test::process(Package &package) const
                 int next_position = 0;
                 int error_code = 0;
                 std::string addinfo;
+                
+                int number = 0;
+                mp::util::piggyback(*req->smallSetUpperBound,
+                                     *req->largeSetLowerBound,
+                                     *req->mediumSetPresentNumber,
+                                     result_set_size,
+                                     number);
 
-                if (result_set_size < *req->smallSetUpperBound)
-                {
-                    // small set . Return all records in set
-                    records = m_p->fetch(
-                        odr, req->preferredRecordSyntax,
-                        1, result_set_size,
-                        error_code, addinfo,
-                        &number_returned,
-                        &next_position);
-                }
-                else if (result_set_size > *req->largeSetLowerBound)
-                {
-                    // large set . Return no records
-                }
-                else
+                if (number)
                 {
-                    // medium set .Return mediumSetPresentNumber records
-                    int to_get = *req->mediumSetPresentNumber;
-                    if (to_get > result_set_size)
-                        to_get = result_set_size;
                     records = m_p->fetch(
                         odr, req->preferredRecordSyntax,
-                        1, to_get,
+                        1, number,
                         error_code, addinfo,
                         &number_returned,
                         &next_position);
@@ -306,13 +296,13 @@ void yf::Backend_test::process(Package &package) const
         m_p->m_sessions.release(package.session());
 }
 
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
 {
-    return new yp2::filter::Backend_test;
+    return new mp::filter::BackendTest;
 }
 
 extern "C" {
-    struct yp2_filter_struct yp2_filter_backend_test = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_backend_test = {
         0,
         "backend_test",
         filter_creator