projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test_solr.sh uses stable SOLR test server
[pazpar2-moved-to-github.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index
c8945f8
..
5bebb59
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-403,11
+403,6
@@
static int nativesyntax_to_type(struct session_database *sdb, char *type,
strcpy(type, "xml");
return 0;
}
strcpy(type, "xml");
return 0;
}
- else if (!strcmp(syntax, "TXML"))
- {
- strcpy(type, "txml");
- return 0;
- }
else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21"))
{
strcpy(type, "xml; charset=marc8-s");
else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21"))
{
strcpy(type, "xml; charset=marc8-s");
@@
-856,14
+851,6
@@
void client_disconnect(struct client *cl)
client_set_connection(cl, 0);
}
client_set_connection(cl, 0);
}
-// Extract terms from query into null-terminated termlist
-static void extract_terms(NMEM nmem, struct ccl_rpn_node *query, char **termlist)
-{
- int num = 0;
-
- pull_terms(nmem, query, termlist, &num);
- termlist[num] = 0;
-}
// Initialize CCL map for a target
static CCL_bibset prepare_cclmap(struct client *cl)
// Initialize CCL map for a target
static CCL_bibset prepare_cclmap(struct client *cl)
@@
-983,8
+970,8
@@
static void apply_limit(struct session_database *sdb,
}
if (!s)
{
}
if (!s)
{
- yaz_log(YLOG_WARN, "limit %s used, but no limitmap defined",
- name);
+ yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined",
+ (sdb->database ? sdb->database->url : "<no url>"), name);
}
}
}
}
}
}
@@
-1082,11
+1069,8
@@
int client_parse_query(struct client *cl, const char *query,
if (!se->relevance)
{
// Initialize relevance structure with query terms
if (!se->relevance)
{
// Initialize relevance structure with query terms
- char *p[512];
- extract_terms(se->nmem, cn, p);
- se->relevance = relevance_create(
- se->service->relevance_pct,
- se->nmem, (const char **) p);
+ se->relevance = relevance_create_ccl(
+ se->service->charsets, se->nmem, cn);
}
ccl_rpn_delete(cn);
}
ccl_rpn_delete(cn);