X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=d649561746ea66179f65395cfd240edf0a8df957;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=5fe5338d2f2ec622cff9801b6f95e04eda42c590;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp index 5fe5338..d649561 100644 --- a/src/filter_backend_test.cpp +++ b/src/filter_backend_test.cpp @@ -1,14 +1,26 @@ -/* $Id: filter_backend_test.cpp,v 1.18 2006-03-16 10:40:59 adam Exp $ - Copyright (c) 2005-2006, Index Data. +/* This file is part of Metaproxy. + Copyright (C) Index Data -%LICENSE% - */ +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 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 "package.hpp" -#include "util.hpp" +#include +#include +#include #include "filter_backend_test.hpp" #include @@ -22,6 +34,7 @@ #include #include #include +#include namespace mp = metaproxy_1; namespace yf = mp::filter; @@ -31,12 +44,15 @@ namespace metaproxy_1 { namespace filter { class Session_info { int dummy; + public: + Session_info() { dummy = 0; }; }; - 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,41 +93,70 @@ 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) { - oident *prefformat; - oid_value form; - + const char *element_set_name = "F"; // default to use + if (number + start - 1 > result_set_size || start < 1) { error_code = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; return 0; } - if (!(prefformat = oid_getentbyoid(preferredRecordSyntax))) - form = VAL_NONE; + if (!preferredRecordSyntax) + preferredRecordSyntax = odr_oiddup(odr, yaz_oid_recsyn_usmarc); + + if (preferredRecordSyntax) + { + if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) + ; + else if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) + ; + else + { + 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; + } + element_set_name = esn->u.generic; + } + if (!strcmp(element_set_name, "B") + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) + ; // Brief + else if (!strcmp(element_set_name, "F") + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) + ; // Full + else if (!strncmp(element_set_name, "FF", 2) + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) + ; // Huge XML test record else - form = prefformat->value; - switch(form) { - case VAL_NONE: - case VAL_USMARC: - break; - default: - error_code = YAZ_BIB1_RECORD_SYNTAX_UNSUPP; + error_code + = YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; + addinfo = std::string(element_set_name); return 0; } - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); rec->which = Z_Records_DBOSD; rec->u.databaseOrSurDiagnostics = (Z_NamePlusRecordList *) @@ -128,12 +173,31 @@ Z_Records *yf::Backend_test::Rep::fetch( npr->databaseName = 0; npr->which = Z_NamePlusRecord_databaseRecord; - char *tmp_rec = odr_strdup(odr, marc_record); - char offset_str[30]; - sprintf(offset_str, "test__%09d_", i+start); - memcpy(tmp_rec+186, offset_str, strlen(offset_str)); - npr->u.databaseRecord = z_ext_record(odr, VAL_USMARC, - tmp_rec, strlen(tmp_rec)); + if (!strncmp(element_set_name, "FF", 2)) + { // Huge XML test record + size_t sz = 1024; + if (element_set_name[2]) + sz = atoi(element_set_name+2) * 1024; + if (sz < 10) + sz = 10; + char *tmp_rec = (char*) xmalloc(sz); + + memset(tmp_rec, 'a', sz); + memcpy(tmp_rec, "", 3); + memcpy(tmp_rec + sz - 4, "", 4); + + npr->u.databaseRecord = z_ext_record_xml(odr, tmp_rec, sz); + xfree(tmp_rec); + } + else + { + char *tmp_rec = odr_strdup(odr, marc_record); + char offset_str[30]; + sprintf(offset_str, "test__%09d_", i+start); + memcpy(tmp_rec+186, offset_str, strlen(offset_str)); + npr->u.databaseRecord = z_ext_record_usmarc( + odr, tmp_rec, strlen(tmp_rec)); + } } *number_returned = number; @@ -144,7 +208,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(); @@ -155,8 +219,8 @@ void yf::Backend_test::process(Package &package) const Z_APDU *apdu_req = gdu->u.z3950; Z_APDU *apdu_res = 0; mp::odr odr; - - if (apdu_req->which != Z_APDU_initRequest && + + if (apdu_req->which != Z_APDU_initRequest && !m_p->m_sessions.exist(package.session())) { apdu_res = odr.create_close(apdu_req, @@ -170,14 +234,14 @@ void yf::Backend_test::process(Package &package) const Z_InitRequest *req = apdu_req->u.initRequest; Z_InitResponse *resp = apdu_res->u.initResponse; - resp->implementationName = "backend_test"; + resp->implementationName = odr_strdup(odr, "backend_test"); if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) m_p->m_support_named_result_sets = true; - + int i; static const int masks[] = { Z_Options_search, Z_Options_present, - Z_Options_namedResultSets, -1 + Z_Options_namedResultSets, -1 }; for (i = 0; masks[i] != -1; i++) if (ODR_MASK_GET(req->options, masks[i])) @@ -194,17 +258,20 @@ void yf::Backend_test::process(Package &package) const else break; + *resp->preferredMessageSize = *req->preferredMessageSize; + *resp->maximumRecordSize = *req->maximumRecordSize; + Session_info info; m_p->m_sessions.create(info, package.session()); } else if (apdu_req->which == Z_APDU_searchRequest) { Z_SearchRequest *req = apdu_req->u.searchRequest; - - if (!m_p->m_support_named_result_sets && + + if (!m_p->m_support_named_result_sets && strcmp(req->resultSetName, "default")) { - apdu_res = + apdu_res = odr.create_searchResponse( apdu_req, YAZ_BIB1_RESULT_SET_NAMING_UNSUPP, 0); } @@ -215,18 +282,21 @@ 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); + const char *element_set_name = 0; + + Odr_int number = 0; + mp::util::piggyback_sr(req, result_set_size, + number, &element_set_name); 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, @@ -234,7 +304,7 @@ void yf::Backend_test::process(Package &package) const } if (error_code) { - apdu_res = + apdu_res = odr.create_searchResponse( apdu_req, error_code, addinfo.c_str()); Z_SearchResponse *resp = apdu_res->u.searchResponse; @@ -242,7 +312,7 @@ void yf::Backend_test::process(Package &package) const } else { - apdu_res = + apdu_res = odr.create_searchResponse(apdu_req, 0, 0); Z_SearchResponse *resp = apdu_res->u.searchResponse; *resp->resultCount = result_set_size; @@ -253,14 +323,31 @@ void yf::Backend_test::process(Package &package) const } } else if (apdu_req->which == Z_APDU_presentRequest) - { + { Z_PresentRequest *req = apdu_req->u.presentRequest; int number_returned = 0; 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, @@ -282,6 +369,12 @@ void yf::Backend_test::process(Package &package) const *resp->nextResultSetPosition = next_position; } } + else if (apdu_req->which == Z_APDU_close) + { + apdu_res = odr.create_close(apdu_req, + Z_Close_finished, 0); + package.session().close(); + } else { apdu_res = odr.create_close(apdu_req, @@ -296,9 +389,15 @@ void yf::Backend_test::process(Package &package) const m_p->m_sessions.release(package.session()); } +void mp::filter::BackendTest::configure(const xmlNode * ptr, bool test_only, + const char *path) +{ + mp::xml::check_empty(ptr); +} + static mp::filter::Base* filter_creator() { - return new mp::filter::Backend_test; + return new mp::filter::BackendTest; } extern "C" { @@ -313,8 +412,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 */ +