X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=b79651a72b36253e063cd09b5e6f6f47c63ebf26;hb=50597d2f7d3607e91c94601eb8eb495d73be3eae;hp=e025cf9429c483983e1224f79b2416c13777aa28;hpb=a0158b296868f0ebccd31910eed80f2a2f5878cc;p=metaproxy-moved-to-github.git diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp index e025cf9..b79651a 100644 --- a/src/filter_backend_test.cpp +++ b/src/filter_backend_test.cpp @@ -1,14 +1,26 @@ -/* $Id: filter_backend_test.cpp,v 1.23 2007-03-08 09:38:31 adam Exp $ - Copyright (c) 2005-2007, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2012 Index Data - See the LICENSE file for details - */ +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,6 +44,8 @@ namespace metaproxy_1 { namespace filter { class Session_info { int dummy; + public: + Session_info() { dummy = 0; }; }; class BackendTest::Rep { friend class BackendTest; @@ -91,8 +106,6 @@ Z_Records *yf::BackendTest::Rep::fetch( 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) @@ -101,21 +114,20 @@ Z_Records *yf::BackendTest::Rep::fetch( return 0; } - if (!(prefformat = oid_getentbyoid(preferredRecordSyntax))) - form = VAL_NONE; - else - form = prefformat->value; - switch(form) + if (!preferredRecordSyntax) + preferredRecordSyntax = odr_oiddup(odr, yaz_oid_recsyn_usmarc); + + if (preferredRecordSyntax) { - case VAL_NONE: - form = VAL_USMARC; - break; - case VAL_USMARC: - case VAL_TEXT_XML: - break; - default: - error_code = YAZ_BIB1_RECORD_SYNTAX_UNSUPP; - return 0; + 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 @@ -129,11 +141,14 @@ Z_Records *yf::BackendTest::Rep::fetch( } element_set_name = esn->u.generic; } - if (!strcmp(element_set_name, "B") && form == VAL_USMARC) + if (!strcmp(element_set_name, "B") + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) ; // Brief - else if (!strcmp(element_set_name, "F") && form == VAL_USMARC) + else if (!strcmp(element_set_name, "F") + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) ; // Full - else if (!strncmp(element_set_name, "FF", 2) && form == VAL_TEXT_XML) + else if (!strncmp(element_set_name, "FF", 2) + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) ; // Huge XML test record else { @@ -171,7 +186,7 @@ Z_Records *yf::BackendTest::Rep::fetch( memcpy(tmp_rec, "", 3); memcpy(tmp_rec + sz - 4, "", 4); - npr->u.databaseRecord = z_ext_record(odr, VAL_TEXT_XML, tmp_rec, sz); + npr->u.databaseRecord = z_ext_record_xml(odr, tmp_rec, sz); xfree(tmp_rec); } else @@ -180,8 +195,8 @@ Z_Records *yf::BackendTest::Rep::fetch( 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)); + npr->u.databaseRecord = z_ext_record_usmarc( + odr, tmp_rec, strlen(tmp_rec)); } } @@ -219,7 +234,7 @@ void yf::BackendTest::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; @@ -243,6 +258,9 @@ void yf::BackendTest::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()); } @@ -264,13 +282,11 @@ void yf::BackendTest::process(Package &package) const int next_position = 0; int error_code = 0; std::string addinfo; + const char *element_set_name = 0; - int number = 0; - mp::util::piggyback(*req->smallSetUpperBound, - *req->largeSetLowerBound, - *req->mediumSetPresentNumber, - result_set_size, - number); + Odr_int number = 0; + mp::util::piggyback_sr(req, result_set_size, + number, &element_set_name); if (number) { // not a large set for sure @@ -353,6 +369,12 @@ void yf::BackendTest::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, @@ -367,6 +389,12 @@ void yf::BackendTest::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::BackendTest; @@ -384,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 */ +