X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=da2f4f5397ba27c82a371f669b04c66c33ba0767;hb=e0274b6e40958df2e422b1e3db69a9bc710f5357;hp=90feab8048efa1f1ad91f07042ce55a4c4777c08;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp
index 90feab8..da2f4f5 100644
--- a/src/filter_backend_test.cpp
+++ b/src/filter_backend_test.cpp
@@ -1,5 +1,5 @@
-/* $Id: filter_backend_test.cpp,v 1.19 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_backend_test.cpp,v 1.22 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -32,11 +32,12 @@ namespace metaproxy_1 {
         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,
+                Z_ElementSetNames *esn,
                 int start, int number, int &error_code, std::string &addinfo,
                 int *number_returned, int *next_position);
 
@@ -77,15 +78,16 @@ 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,
+    Z_ElementSetNames *esn,
     int start, int number, int &error_code, std::string &addinfo,
     int *number_returned, int *next_position)
 {
@@ -111,7 +113,25 @@ Z_Records *yf::Backend_test::Rep::fetch(
         error_code = YAZ_BIB1_RECORD_SYNTAX_UNSUPP;
         return 0;
     }
-    
+
+    // no element set, "B" and "F" are supported
+    if (esn)
+    {
+        if (esn->which != Z_ElementSetNames_generic)
+        {
+            error_code 
+                = YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+            return 0;
+        }
+        const char *name = esn->u.generic;
+        if (strcmp(name, "B") && strcmp(name, "F"))
+        {
+            error_code 
+                = YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+            addinfo = std::string(name);
+            return 0;
+        }
+    }
     Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records));
     rec->which = Z_Records_DBOSD;
     rec->u.databaseOrSurDiagnostics = (Z_NamePlusRecordList *)
@@ -144,7 +164,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();
 
@@ -218,15 +238,20 @@ void yf::Backend_test::process(Package &package) const
                 
                 int number = 0;
                 mp::util::piggyback(*req->smallSetUpperBound,
-                                     *req->largeSetLowerBound,
-                                     *req->mediumSetPresentNumber,
-                                     result_set_size,
-                                     number);
-
-                if (number)
-                {
+                                    *req->largeSetLowerBound,
+                                    *req->mediumSetPresentNumber,
+                                    result_set_size,
+                                    number);
+                
+                if (number) 
+                {   // not a large set for sure 
+                    Z_ElementSetNames *esn;
+                    if (number > *req->smallSetUpperBound)
+                        esn = req->mediumSetElementSetNames;
+                    else
+                        esn = req->smallSetElementSetNames;
                     records = m_p->fetch(
-                        odr, req->preferredRecordSyntax,
+                        odr, req->preferredRecordSyntax, esn,
                         1, number,
                         error_code, addinfo,
                         &number_returned,
@@ -259,8 +284,25 @@ void yf::Backend_test::process(Package &package) const
             int next_position = 0;
             int error_code = 0;
             std::string addinfo;
+            Z_ElementSetNames *esn = 0;
+
+            if (req->recordComposition)
+            {
+                if (req->recordComposition->which == Z_RecordComp_simple)
+                    esn = req->recordComposition->u.simple;
+                else
+                {
+                    apdu_res =
+                        odr.create_presentResponse(
+                            apdu_req,
+                            YAZ_BIB1_ONLY_A_SINGLE_ELEMENT_SET_NAME_SUPPORTED,
+                            0);
+                    package.response() = apdu_res;
+                    return;
+                }
+            }
             Z_Records *records = m_p->fetch(
-                odr, req->preferredRecordSyntax,
+                odr, req->preferredRecordSyntax, esn,
                 *req->resultSetStartPoint, *req->numberOfRecordsRequested,
                 error_code, addinfo,
                 &number_returned,
@@ -298,7 +340,7 @@ void yf::Backend_test::process(Package &package) const
 
 static mp::filter::Base* filter_creator()
 {
-    return new mp::filter::Backend_test;
+    return new mp::filter::BackendTest;
 }
 
 extern "C" {