-/* $Id: pazpar2.c,v 1.51 2007-03-20 07:27:51 adam Exp $ */
+/* $Id: pazpar2.c,v 1.57 2007-03-30 02:45:07 quinn Exp $ */
#include <stdlib.h>
#include <stdio.h>
#include <yaz/proto.h>
#include <yaz/readconf.h>
#include <yaz/pquery.h>
+#include <yaz/otherinfo.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
#include "relevance.h"
#include "config.h"
#include "database.h"
+#include "settings.h"
#define MAX_CHUNK 15
{
"",
"",
+ "",
+ "",
0,
0,
30,
MAX_CHUNK,
0,
0,
- 0,
0
};
static void send_init(IOCHAN i)
{
+
struct connection *co = iochan_getdata(i);
struct client *cl = co->client;
Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_initRequest);
ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_1);
ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_2);
ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_3);
+
+
+ /* add virtual host if tunneling through Z39.50 proxy */
+
+ if (0 < strlen(global_parameters.zproxy_override)
+ && 0 < strlen(cl->database->url))
+ yaz_oi_set_string_oidval(&a->u.initRequest->otherInfo,
+ global_parameters.odr_out, VAL_PROXY,
+ 1, cl->database->url);
+
+
+
if (send_apdu(cl, a) >= 0)
{
iochan_setflags(i, EVENT_INPUT);
odr_reset(global_parameters.odr_out);
}
+static void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num)
+{
+ switch (n->kind)
+ {
+ case CCL_RPN_AND:
+ case CCL_RPN_OR:
+ case CCL_RPN_NOT:
+ case CCL_RPN_PROX:
+ pull_terms(nmem, n->u.p[0], termlist, num);
+ pull_terms(nmem, n->u.p[1], termlist, num);
+ break;
+ case CCL_RPN_TERM:
+ termlist[(*num)++] = nmem_strdup(nmem, n->u.t.term);
+ break;
+ default: // NOOP
+ break;
+ }
+}
+
+// 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;
+}
+
static void send_search(IOCHAN i)
{
struct connection *co = iochan_getdata(i);
yaz_log(YLOG_DEBUG, "Sending search");
- cn = ccl_find_str(global_parameters.ccl_filter, se->query, &cerror, &cpos);
+ cn = ccl_find_str(db->ccl_map, se->query, &cerror, &cpos);
if (!cn)
return;
+
+ if (!se->relevance)
+ {
+ // Initialize relevance structure with query terms
+ char *p[512];
+ extract_terms(se->nmem, cn, p);
+ se->relevance = relevance_create(se->nmem, (const char **) p,
+ se->expected_maxrecs);
+ }
+
a->u.searchRequest->query = zquery = odr_malloc(global_parameters.odr_out,
sizeof(Z_Query));
zquery->which = Z_Query_type_1;
yaz_log(YLOG_WARN, "Failed to encode as XML");
return 0;
}
- rdoc = xmlNewDoc("1.0");
+ rdoc = xmlNewDoc((xmlChar *) "1.0");
xmlDocSetRootElement(rdoc, res);
}
else
return 0;
root = xmlDocGetRootElement(xdoc);
- if (!(mergekey = xmlGetProp(root, "mergekey")))
+ if (!(mergekey = xmlGetProp(root, (xmlChar *) "mergekey")))
{
yaz_log(YLOG_WARN, "No mergekey found in record");
xmlFreeDoc(xdoc);
sizeof(struct record_metadata*) * service->num_metadata);
memset(res->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
- mergekey_norm = nmem_strdup(se->nmem, (char*) mergekey);
+ mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey);
xmlFree(mergekey);
- normalize_mergekey(mergekey_norm, 0);
+ normalize_mergekey((char *) mergekey_norm, 0);
- cluster = reclist_insert(se->reclist, res, mergekey_norm, &se->total_merged);
+ cluster = reclist_insert(se->reclist, res, (char *) mergekey_norm,
+ &se->total_merged);
if (global_parameters.dump_records)
yaz_log(YLOG_LOG, "Cluster id %d from %s (#%d)", cluster->recid,
cl->database->url, cl->records);
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, "metadata"))
+ if (!strcmp((const char *) n->name, "metadata"))
{
struct conf_metadata *md = 0;
struct conf_sortkey *sk = 0;
int imeta;
int first, last;
- type = xmlGetProp(n, "type");
+ type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 0);
if (!type || !value)
// First, find out what field we're looking at
for (imeta = 0; imeta < service->num_metadata; imeta++)
- if (!strcmp(type, service->metadata[imeta].name))
+ if (!strcmp((const char *) type, service->metadata[imeta].name))
{
md = &service->metadata[imeta];
if (md->sortkey_offset >= 0)
if (md->type == Metadata_type_generic)
{
char *p, *pe;
- for (p = value; *p && isspace(*p); p++)
+ for (p = (char *) value; *p && isspace(*p); p++)
;
for (pe = p + strlen(p) - 1;
pe > p && strchr(" ,/.:([", *pe); pe--)
}
else if (md->type == Metadata_type_year)
{
- if (extract_years(value, &first, &last) < 0)
+ if (extract_years((char *) value, &first, &last) < 0)
continue;
}
else
{
struct record_metadata *mnode;
for (mnode = *wheretoput; mnode; mnode = mnode->next)
- if (!strcmp(mnode->data.text, newm->data.text))
+ if (!strcmp((const char *) mnode->data.text, newm->data.text))
break;
if (!mnode)
{
yaz_log(YLOG_WARN, "Don't know how to merge on element name %s", md->name);
if (md->rank)
- relevance_countwords(se->relevance, cluster, value, md->rank);
+ relevance_countwords(se->relevance, cluster,
+ (char *) value, md->rank);
if (md->termlist)
{
if (md->type == Metadata_type_year)
{
char year[64];
sprintf(year, "%d", last);
- add_facet(se, type, year);
+ add_facet(se, (char *) type, year);
if (first != last)
{
sprintf(year, "%d", first);
- add_facet(se, type, year);
+ add_facet(se, (char *) type, year);
}
}
else
- add_facet(se, type, value);
+ add_facet(se, (char *) type, (char *) value);
}
xmlFree(type);
xmlFree(value);
int res;
void *addr;
- yaz_log(YLOG_DEBUG, "Connection create %s", cl->database->url);
+
if (!(link = cs_create(tcpip_type, 0, PROTO_Z3950)))
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack");
- exit(1);
- }
+ {
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack");
+ exit(1);
+ }
+
+ if (0 == strlen(global_parameters.zproxy_override)){
+ /* no Z39.50 proxy needed - direct connect */
+ yaz_log(YLOG_DEBUG, "Connection create %s", cl->database->url);
+
+ if (!(addr = cs_straddr(link, cl->database->host->ipport)))
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO,
+ "Lookup of IP address %s failed",
+ cl->database->host->ipport);
+ return 0;
+ }
+
+ } else {
+ /* Z39.50 proxy connect */
+ yaz_log(YLOG_DEBUG, "Connection create %s proxy %s",
+ cl->database->url, global_parameters.zproxy_override);
- if (!(addr = cs_straddr(link, cl->database->host->ipport)))
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "Lookup of IP address %s failed?",
- cl->database->host->ipport);
- return 0;
+ yaz_log(YLOG_LOG, "Connection cs_create_host %s proxy %s",
+ cl->database->url, global_parameters.zproxy_override);
+
+ if (!(addr = cs_straddr(link, global_parameters.zproxy_override)))
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO,
+ "Lookup of IP address %s failed",
+ global_parameters.zproxy_override);
+ return 0;
+ }
}
res = cs_connect(link, addr);
cl->connection = new;
new->link = link;
- new->iochan = iochan_create(cs_fileno(link), handler, 0);
+ new->iochan = iochan_create(cs_fileno(link), 0, handler, 0);
iochan_setdata(new->iochan, new);
new->iochan->next = channel_list;
channel_list = new->iochan;
yaz_log(YLOG_LOG, "Target: %s, '%s'", url, db);
for (host = hosts; host; host = host->next)
- if (!strcmp(url, host->hostport))
+ if (!strcmp((const char *) url, host->hostport))
break;
if (!host)
{
#endif
-static void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num)
-{
- switch (n->kind)
- {
- case CCL_RPN_AND:
- case CCL_RPN_OR:
- case CCL_RPN_NOT:
- case CCL_RPN_PROX:
- pull_terms(nmem, n->u.p[0], termlist, num);
- pull_terms(nmem, n->u.p[1], termlist, num);
- break;
- case CCL_RPN_TERM:
- termlist[(*num)++] = nmem_strdup(nmem, n->u.t.term);
- break;
- default: // NOOP
- break;
- }
-}
-
-// Extract terms from query into null-terminated termlist
-static int extract_terms(NMEM nmem, char *query, char **termlist)
-{
- int error, pos;
- struct ccl_rpn_node *n;
- int num = 0;
-
- n = ccl_find_str(global_parameters.ccl_filter, query, &error, &pos);
- if (!n)
- return -1;
- pull_terms(nmem, n, termlist, &num);
- termlist[num] = 0;
- ccl_rpn_delete(n);
- return 0;
-}
-
static struct client *client_create(void)
{
struct client *r;
return res;
}
-// parses crit1=val1,crit2=val2,...
+// parses crit1=val1,crit2=val2|val3,...
static struct database_criterion *parse_filter(NMEM m, const char *buf)
{
struct database_criterion *res = 0;
nmem_strsplit(m, ",", buf, &values, &num);
for (i = 0; i < num; i++)
{
+ char **subvalues;
+ int subnum;
+ int subi;
struct database_criterion *new = nmem_malloc(m, sizeof(*new));
char *eq = strchr(values[i], '=');
if (!eq)
}
*(eq++) = '\0';
new->name = values[i];
- new->value = eq;
+ nmem_strsplit(m, "|", eq, &subvalues, &subnum);
+ new->values = 0;
+ for (subi = 0; subi < subnum; subi++)
+ {
+ struct database_criterion_value *newv = nmem_malloc(m, sizeof(*newv));
+ newv->value = subvalues[subi];
+ newv->next = new->values;
+ new->values = newv;
+ }
new->next = res;
res = new;
}
}
if (live_channels)
{
- char *p[512];
int maxrecs = live_channels * global_parameters.toget;
se->num_termlists = 0;
se->reclist = reclist_create(se->nmem, maxrecs);
- extract_terms(se->nmem, query, p);
- se->relevance = relevance_create(se->nmem, (const char **) p, maxrecs);
+ // This will be initialized in send_search()
+ se->relevance = 0;
se->total_records = se->total_hits = se->total_merged = 0;
se->expected_maxrecs = maxrecs;
}
int i;
for (i = 0; i < s->num_termlists; i++)
- if (!strcmp(s->termlists[i].name, name))
+ if (!strcmp((const char *) s->termlists[i].name, name))
return termlist_highscore(s->termlists[i].termlist, num);
return 0;
}
stat->num_clients = count;
}
-static CCL_bibset load_cclfile(const char *fn)
-{
- CCL_bibset res = ccl_qual_mk();
- if (ccl_qual_fname(res, fn) < 0)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", fn);
- exit(1);
- }
- return res;
-}
-
static void start_http_listener(void)
{
char hp[128] = "";
http_init(hp);
}
+// Initialize CCL map for a target
+// Note: This approach ignores user-specific CCL maps, for which I
+// don't presently see any application.
+static void prepare_cclmap(void *context, struct database *db)
+{
+ struct setting *s;
+
+ if (!db->settings)
+ return;
+ db->ccl_map = ccl_qual_mk();
+ for (s = db->settings[PZ_CCLMAP]; s; s = s->next)
+ if (!*s->user)
+ {
+ char *p = strchr(s->name + 3, ':');
+ if (!p)
+ {
+ yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name);
+ exit(1);
+ }
+ p++;
+ ccl_qual_fitem(db->ccl_map, s->value, p);
+ }
+}
+
+// Read settings for each database, and prepare a CCL map for that database
+static void prepare_cclmaps(void)
+{
+ grep_databases(0, 0, prepare_cclmap);
+}
+
static void start_proxy(void)
{
char hp[128] = "";
http_set_proxyaddr(hp, ser->myurl ? ser->myurl : "");
}
+static void start_zproxy(void)
+{
+ struct conf_server *ser = global_parameters.server;
+
+ if (*global_parameters.zproxy_override){
+ yaz_log(YLOG_LOG, "Z39.50 proxy %s",
+ global_parameters.zproxy_override);
+ return;
+ }
+
+ else if (ser->zproxy_host || ser->zproxy_port)
+ {
+ char hp[128] = "";
+
+ strcpy(hp, ser->zproxy_host ? ser->zproxy_host : "");
+ if (ser->zproxy_port)
+ {
+ if (*hp)
+ strcat(hp, ":");
+ else
+ strcat(hp, "@:");
+
+ sprintf(hp + strlen(hp), "%d", ser->zproxy_port);
+ }
+ strcpy(global_parameters.zproxy_override, hp);
+ yaz_log(YLOG_LOG, "Z39.50 proxy %s",
+ global_parameters.zproxy_override);
+
+ }
+ else
+ return;
+}
+
+
+
int main(int argc, char **argv)
{
int ret;
yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0);
- while ((ret = options("f:x:h:p:C:s:d", argv, argc, &arg)) != -2)
+ while ((ret = options("t:f:x:h:p:z:s:d", argv, argc, &arg)) != -2)
{
switch (ret) {
case 'f':
case 'h':
strcpy(global_parameters.listener_override, arg);
break;
- case 'C':
- global_parameters.ccl_filter = load_cclfile(arg);
- break;
case 'p':
strcpy(global_parameters.proxy_override, arg);
break;
+ case 'z':
+ strcpy(global_parameters.zproxy_override, arg);
+ break;
+ case 't':
+ strcpy(global_parameters.settings_path_override, arg);
+ break;
case 's':
load_simpletargets(arg);
break;
" -C cclconfig\n"
" -s simpletargetfile\n"
" -p hostname[:portno] (HTTP proxy)\n"
+ " -z hostname[:portno] (Z39.50 proxy)\n"
" -d (show internal records)\n");
exit(1);
}
start_http_listener();
start_proxy();
- if (!global_parameters.ccl_filter)
- global_parameters.ccl_filter = load_cclfile("../etc/default.bib");
+ start_zproxy();
+
+ if (*global_parameters.settings_path_override)
+ settings_read(global_parameters.settings_path_override);
+ else if (global_parameters.server->settings)
+ settings_read(global_parameters.server->settings);
+ else
+ yaz_log(YLOG_WARN, "No settings-directory specified. Problems may ensue!");
+ prepare_cclmaps();
global_parameters.yaz_marc = yaz_marc_create();
yaz_marc_subfield_str(global_parameters.yaz_marc, "\t");
global_parameters.odr_in = odr_createmem(ODR_DECODE);
projects / pazpar2-moved-to-github.git / blobdiff