projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5d024b6
)
Update test_solr, due to regression when query is omitted
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 10 Sep 2013 09:33:33 +0000
(11:33 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 10 Sep 2013 09:33:33 +0000
(11:33 +0200)
test/test_solr.c
patch
|
blob
|
history
diff --git
a/test/test_solr.c
b/test/test_solr.c
index
6b156a2
..
e4f1c74
100644
(file)
--- a/
test/test_solr.c
+++ b/
test/test_solr.c
@@
-8,6
+8,7
@@
#include <stdlib.h>
#include <yaz/srw.h>
#include <stdlib.h>
#include <yaz/srw.h>
+#include <yaz/log.h>
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#endif
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#endif
@@
-65,9
+66,10
@@
void tst_encoding(void)
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
+ sr->u.request->query = "title:solr";
YAZ_CHECK(compare_solr_req(
odr, sr, 0,
YAZ_CHECK(compare_solr_req(
odr, sr, 0,
- "GET Default/select? HTTP/1.1\r\n"
+ "GET Default/select?q=title%3Asolr HTTP/1.1\r\n"
"User-Agent: YAZ/" YAZ_VERSION "\r\n"
"Host: localhost\r\n"
"Content-Type: text/xml\r\n\r\n"));
"User-Agent: YAZ/" YAZ_VERSION "\r\n"
"Host: localhost\r\n"
"Content-Type: text/xml\r\n\r\n"));
@@
-76,9
+78,10
@@
void tst_encoding(void)
{
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
{
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
+ sr->u.request->query = "title:solr";
YAZ_CHECK(compare_solr_req(
odr, sr, "utf-8",
YAZ_CHECK(compare_solr_req(
odr, sr, "utf-8",
- "GET Default/select? HTTP/1.1\r\n"
+ "GET Default/select?q=title%3Asolr HTTP/1.1\r\n"
"User-Agent: YAZ/" YAZ_VERSION "\r\n"
"Host: localhost\r\n"
"Content-Type: text/xml; charset=utf-8\r\n\r\n"));
"User-Agent: YAZ/" YAZ_VERSION "\r\n"
"Host: localhost\r\n"
"Content-Type: text/xml; charset=utf-8\r\n\r\n"));
@@
-88,8
+91,7
@@
void tst_encoding(void)
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = "title:solr";
+ sr->u.request->query = "title:solr";
sr->u.request->startRecord = odr_intdup(odr, 3);
sr->u.request->maximumRecords = odr_intdup(odr, 10);
sr->u.request->startRecord = odr_intdup(odr, 3);
sr->u.request->maximumRecords = odr_intdup(odr, 10);
@@
-106,8
+108,7
@@
void tst_encoding(void)
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
"1.2");
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = "title:solr";
+ sr->u.request->query = "title:solr";
sr->u.request->startRecord = odr_intdup(odr, 3);
sr->u.request->maximumRecords = odr_intdup(odr, 10);
sr->u.request->facetList = yaz_pqf_parse_facet_list(
sr->u.request->startRecord = odr_intdup(odr, 3);
sr->u.request->maximumRecords = odr_intdup(odr, 10);
sr->u.request->facetList = yaz_pqf_parse_facet_list(