-/* $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-2008 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 <yaz/log.h>
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
+#include <yaz/oid_db.h>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
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)
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
}
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
{
memcpy(tmp_rec, "<a>", 3);
memcpy(tmp_rec + sz - 4, "</a>", 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
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));
}
}