projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat: delete trailing whitespace
[yazpp-moved-to-github.git]
/
zlint
/
test-search-01.cpp
diff --git
a/zlint/test-search-01.cpp
b/zlint/test-search-01.cpp
index
05e5fa8
..
2df1ef5
100644
(file)
--- a/
zlint/test-search-01.cpp
+++ b/
zlint/test-search-01.cpp
@@
-1,8
+1,11
@@
/* This file is part of the yazpp toolkit.
/* This file is part of the yazpp toolkit.
- * Copyright (C) 1998-2010 Index Data and Mike Taylor
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/log.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
@@
-96,14
+99,14
@@
Zlint_code Zlint_test_search_01::sendTest(Zlint *z)
sr->query->which = Z_Query_type_1;
Z_RPNQuery *rpn;
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
sr->query->which = Z_Query_type_1;
Z_RPNQuery *rpn;
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
-
+
z->getDatabase(&sr->databaseNames, &sr->num_databaseNames);
z->getDatabase(&sr->databaseNames, &sr->num_databaseNames);
-
+
rpn = yaz_pqf_parse(pqf_parser, z->odr_encode(),
try_query[m_query_no]);
rpn = yaz_pqf_parse(pqf_parser, z->odr_encode(),
try_query[m_query_no]);
-
+
yaz_pqf_destroy (pqf_parser);
yaz_pqf_destroy (pqf_parser);
-
+
if (!rpn)
{
z->msg_check_fail("Query %s invalid", try_query[m_query_no]);
if (!rpn)
{
z->msg_check_fail("Query %s invalid", try_query[m_query_no]);
@@
-146,7
+149,7
@@
Zlint_code Zlint_test_search_01::sendTest(Zlint *z)
const char *setstring = "default";
int len;
Z_SortRequest *sr = apdu->u.sortRequest;
const char *setstring = "default";
int len;
Z_SortRequest *sr = apdu->u.sortRequest;
-
+
sr->num_inputResultSetNames = 1;
sr->num_inputResultSetNames = 1;
sr->inputResultSetNames = (Z_InternationalString **)
sr->num_inputResultSetNames = 1;
sr->num_inputResultSetNames = 1;
sr->inputResultSetNames = (Z_InternationalString **)
@@
-186,8
+189,8
@@
Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_searchResponse)
{
Z_SearchResponse *sr = gdu->u.z3950->u.searchResponse;
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_searchResponse)
{
Z_SearchResponse *sr = gdu->u.z3950->u.searchResponse;
- if (sr->records && (sr->records->which == Z_Records_NSD
- ||
+ if (sr->records && (sr->records->which == Z_Records_NSD
+ ||
sr->records->which == Z_Records_multipleNSD))
m_query_no++;
else if (!sr->resultCount || *sr->resultCount == 0)
sr->records->which == Z_Records_multipleNSD))
m_query_no++;
else if (!sr->resultCount || *sr->resultCount == 0)
@@
-201,12
+204,12
@@
Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
}
return sendTest(z);
}
}
return sendTest(z);
}
- else if (gdu->which == Z_GDU_Z3950 &&
+ else if (gdu->which == Z_GDU_Z3950 &&
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_presentResponse)
{
Z_PresentResponse *sr = gdu->u.z3950->u.presentResponse;
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_presentResponse)
{
Z_PresentResponse *sr = gdu->u.z3950->u.presentResponse;
- if (sr->records && (sr->records->which == Z_Records_NSD
- ||
+ if (sr->records && (sr->records->which == Z_Records_NSD
+ ||
sr->records->which == Z_Records_multipleNSD))
{
z->msg_check_ok();
sr->records->which == Z_Records_multipleNSD))
{
z->msg_check_ok();
@@
-254,7
+257,7
@@
Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
m_record_syntax_no++;
return sendTest(z);
}
m_record_syntax_no++;
return sendTest(z);
}
- else if (gdu->which == Z_GDU_Z3950 &&
+ else if (gdu->which == Z_GDU_Z3950 &&
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_sortResponse)
{
Z_SortResponse *sr = gdu->u.z3950->u.sortResponse;
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_sortResponse)
{
Z_SortResponse *sr = gdu->u.z3950->u.sortResponse;