-/* $Id: filter_backend_test.cpp,v 1.24 2007-04-13 09:57:51 adam Exp $
- Copyright (c) 2005-2007, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2010 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 <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
#include "filter_backend_test.hpp"
#include <stdexcept>
namespace filter {
class Session_info {
int dummy;
+ public:
+ Session_info() { dummy = 0; };
};
class BackendTest::Rep {
friend class BackendTest;
return 0;
}
- const char *name_oid = OID_STR_USMARC; // default if syntax is given
+ if (!preferredRecordSyntax)
+ preferredRecordSyntax = odr_oiddup(odr, yaz_oid_recsyn_usmarc);
+
if (preferredRecordSyntax)
{
- name_oid =
- yaz_oid_to_string(yaz_oid_std(), preferredRecordSyntax, 0);
- if (name_oid && !strcmp(name_oid, OID_STR_USMARC))
+ if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml))
;
- else if (name_oid && !strcmp(name_oid, OID_STR_XML))
+ else if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc))
;
else
{
element_set_name = esn->u.generic;
}
if (!strcmp(element_set_name, "B")
- && !strcmp(name_oid, OID_STR_USMARC))
+ && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc))
; // Brief
else if (!strcmp(element_set_name, "F")
- && !strcmp(name_oid, OID_STR_USMARC))
+ && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc))
; // Full
else if (!strncmp(element_set_name, "FF", 2)
- && !strcmp(name_oid, OID_STR_XML))
+ && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml))
; // Huge XML test record
else
{
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;
/*
* 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
*/
+