projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #1064: Test test_thread_pool_observer hangs.
[metaproxy-moved-to-github.git]
/
src
/
filter_backend_test.cpp
diff --git
a/src/filter_backend_test.cpp
b/src/filter_backend_test.cpp
index
e025cf9
..
020e823
100644
(file)
--- a/
src/filter_backend_test.cpp
+++ b/
src/filter_backend_test.cpp
@@
-1,4
+1,4
@@
-/* $Id: filter_backend_test.cpp,v 1.23 2007-03-08 09:38:31 adam Exp $
+/* $Id: filter_backend_test.cpp,v 1.25 2007-04-16 21:54:52 adam Exp $
Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
@@
-22,6
+22,7
@@
#include <yaz/log.h>
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
#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;
namespace mp = metaproxy_1;
namespace yf = mp::filter;
@@
-91,8
+92,6
@@
Z_Records *yf::BackendTest::Rep::fetch(
int start, int number, int &error_code, std::string &addinfo,
int *number_returned, int *next_position)
{
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)
const char *element_set_name = "F"; // default to use
if (number + start - 1 > result_set_size || start < 1)
@@
-101,21
+100,20
@@
Z_Records *yf::BackendTest::Rep::fetch(
return 0;
}
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
}
// no element set, "B" and "F" are supported
@@
-129,11
+127,14
@@
Z_Records *yf::BackendTest::Rep::fetch(
}
element_set_name = esn->u.generic;
}
}
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
; // 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
; // 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
{
; // Huge XML test record
else
{
@@
-171,7
+172,7
@@
Z_Records *yf::BackendTest::Rep::fetch(
memcpy(tmp_rec, "<a>", 3);
memcpy(tmp_rec + sz - 4, "</a>", 4);
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
xfree(tmp_rec);
}
else
@@
-180,8
+181,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));
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));
}
}
}
}