-/* $Id: pazpar2.c,v 1.3 2006-12-20 23:28:37 adam Exp $ */;
+/* $Id: pazpar2.c,v 1.61 2007-04-03 04:05:01 quinn Exp $ */
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <assert.h>
+#include <yaz/marcdisp.h>
#include <yaz/comstack.h>
#include <yaz/tcpip.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>
+
+#if HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
+
+#define USE_TIMING 0
+#if USE_TIMING
+#include <yaz/timing.h>
+#endif
+
+#include <netinet/in.h>
#include "pazpar2.h"
#include "eventl.h"
-#include "command.h"
#include "http.h"
#include "termlists.h"
#include "reclists.h"
#include "relevance.h"
+#include "config.h"
+#include "database.h"
+#include "settings.h"
-#define PAZPAR2_VERSION "0.1"
#define MAX_CHUNK 15
static void client_fatal(struct client *cl);
static void connection_destroy(struct connection *co);
static int client_prep_connection(struct client *cl);
static void ingest_records(struct client *cl, Z_Records *r);
+//static struct conf_retrievalprofile *database_retrieval_profile(struct database *db);
void session_alert_watch(struct session *s, int what);
+char *session_setting_oneval(struct session *s, struct database *db, const char *name);
IOCHAN channel_list = 0; // Master list of connections we're handling events to
static struct connection *connection_freelist = 0;
static struct client *client_freelist = 0;
-static struct host *hosts = 0; // The hosts we know about
-static struct database *databases = 0; // The databases we know about
-
static char *client_states[] = {
"Client_Connecting",
"Client_Connected",
"Client_Stopped"
};
+// Note: Some things in this structure will eventually move to configuration
struct parameters global_parameters =
{
+ "",
+ "",
+ "",
+ "",
+ 0,
+ 0,
30,
"81",
"Index Data PazPar2 (MasterKey)",
- PAZPAR2_VERSION,
+ VERSION,
600, // 10 minutes
60,
100,
MAX_CHUNK,
0,
0,
- 0,
0
};
-
static int send_apdu(struct client *c, Z_APDU *a)
{
struct connection *co = c->connection;
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);
Z_Query *zquery;
struct ccl_rpn_node *cn;
int ssub = 0, lslb = 100000, mspn = 10;
+ char *recsyn;
+ char *piggyback;
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;
for (ndb = 0; db->databases[ndb]; ndb++)
databaselist[ndb] = db->databases[ndb];
- a->u.presentRequest->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(global_parameters.odr_out,
- CLASS_RECSYN, VAL_USMARC);
- a->u.searchRequest->smallSetUpperBound = &ssub;
- a->u.searchRequest->largeSetLowerBound = &lslb;
- a->u.searchRequest->mediumSetPresentNumber = &mspn;
+ if (!(piggyback = session_setting_oneval(se, db, "pz:piggyback")) || *piggyback == '1')
+ {
+ if ((recsyn = session_setting_oneval(se, db, "pz:syntax")))
+ a->u.searchRequest->preferredRecordSyntax =
+ yaz_str_to_z3950oid(global_parameters.odr_out,
+ CLASS_RECSYN, recsyn);
+ a->u.searchRequest->smallSetUpperBound = &ssub;
+ a->u.searchRequest->largeSetLowerBound = &lslb;
+ a->u.searchRequest->mediumSetPresentNumber = &mspn;
+ }
a->u.searchRequest->resultSetName = "Default";
a->u.searchRequest->databaseNames = databaselist;
a->u.searchRequest->num_databaseNames = ndb;
{
struct connection *co = iochan_getdata(i);
struct client *cl = co->client;
+ struct session *se = cl->session;
+ struct database *db = cl->database;
Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest);
int toget;
int start = cl->records + 1;
+ char *recsyn;
toget = global_parameters.chunk;
+ if (toget > global_parameters.toget - cl->records)
+ toget = global_parameters.toget - cl->records;
if (toget > cl->hits - cl->records)
toget = cl->hits - cl->records;
a->u.presentRequest->resultSetId = "Default";
- a->u.presentRequest->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(global_parameters.odr_out,
- CLASS_RECSYN, VAL_USMARC);
+ if ((recsyn = session_setting_oneval(se, db, "pz:syntax")))
+ a->u.presentRequest->preferredRecordSyntax =
+ yaz_str_to_z3950oid(global_parameters.odr_out,
+ CLASS_RECSYN, recsyn);
if (send_apdu(cl, a) >= 0)
{
if (r->presentStatus && !*r->presentStatus && r->records)
{
yaz_log(YLOG_DEBUG, "Records in search response");
- cl->records += *r->numberOfRecordsReturned;
ingest_records(cl, r->records);
}
cl->state = Client_Idle;
}
}
-const char *find_field(const char *rec, const char *field)
+char *normalize_mergekey(char *buf, int skiparticle)
{
- char lbuf[5];
- char *line;
+ char *p = buf, *pout = buf;
- lbuf[0] = '\n';
- strcpy(lbuf + 1, field);
+ if (skiparticle)
+ {
+ char firstword[64];
+ char articles[] = "the den der die des an a "; // must end in space
- if ((line = strstr(rec, lbuf)))
- return ++line;
- else
- return 0;
+ while (*p && !isalnum(*p))
+ p++;
+ pout = firstword;
+ while (*p && *p != ' ' && pout - firstword < 62)
+ *(pout++) = tolower(*(p++));
+ *(pout++) = ' ';
+ *(pout++) = '\0';
+ if (!strstr(articles, firstword))
+ p = buf;
+ pout = buf;
+ }
+
+ while (*p)
+ {
+ while (*p && !isalnum(*p))
+ p++;
+ while (isalnum(*p))
+ *(pout++) = tolower(*(p++));
+ if (*p)
+ *(pout++) = ' ';
+ while (*p && !isalnum(*p))
+ p++;
+ }
+ if (buf != pout)
+ do {
+ *(pout--) = '\0';
+ }
+ while (pout > buf && *pout == ' ');
+
+ return buf;
}
-const char *find_subfield(const char *field, char subfield)
+static void add_facet(struct session *s, const char *type, const char *value)
{
- const char *p = field;
+ int i;
- while (*p && *p != '\n')
+ if (!*value)
+ return;
+ for (i = 0; i < s->num_termlists; i++)
+ if (!strcmp(s->termlists[i].name, type))
+ break;
+ if (i == s->num_termlists)
{
- while (*p != '\n' && *p != '\t')
- p++;
- if (*p == '\t' && *(++p) == subfield) {
- if (*(++p) == ' ')
- {
- while (isspace(*p))
- p++;
- return p;
- }
+ if (i == SESSION_MAX_TERMLISTS)
+ {
+ yaz_log(YLOG_FATAL, "Too many termlists");
+ exit(1);
}
+ s->termlists[i].name = nmem_strdup(s->nmem, type);
+ s->termlists[i].termlist = termlist_create(s->nmem, s->expected_maxrecs, 15);
+ s->num_termlists = i + 1;
}
- return 0;
+ termlist_insert(s->termlists[i].termlist, value);
}
-// Extract 245 $a $b 100 $a
-char *extract_title(struct session *s, const char *rec)
+static xmlDoc *normalize_record(struct client *cl, Z_External *rec)
{
- const char *field, *subfield;
- char *e, *ef;
- unsigned char *obuf, *p;
-
- wrbuf_rewind(s->wrbuf);
+ struct conf_retrievalprofile *rprofile = cl->database->rprofile;
+ struct conf_retrievalmap *m;
+ xmlNode *res;
+ xmlDoc *rdoc;
- if (!(field = find_field(rec, "245")))
- return 0;
- if (!(subfield = find_subfield(field, 'a')))
- return 0;
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
+ // First normalize to XML
+ if (rprofile->native_syntax == Nativesyn_iso2709)
{
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- if ((subfield = find_subfield(field, 'b')))
+ char *buf;
+ int len;
+ if (rec->which != Z_External_octet)
{
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
- {
- wrbuf_putc(s->wrbuf, ' ');
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- }
+ yaz_log(YLOG_WARN, "Unexpected external branch, probably BER");
+ return 0;
}
- }
- if ((field = find_field(rec, "100")))
- {
- if ((subfield = find_subfield(field, 'a')))
+ buf = (char*) rec->u.octet_aligned->buf;
+ len = rec->u.octet_aligned->len;
+ if (yaz_marc_read_iso2709(rprofile->yaz_marc, buf, len) < 0)
{
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
- {
- wrbuf_puts(s->wrbuf, ", by ");
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- }
+ yaz_log(YLOG_WARN, "Failed to decode MARC");
+ return 0;
+ }
+ if (yaz_marc_write_xml(rprofile->yaz_marc, &res,
+ "http://www.loc.gov/MARC21/slim", 0, 0) < 0)
+ {
+ yaz_log(YLOG_WARN, "Failed to encode as XML");
+ return 0;
}
+ rdoc = xmlNewDoc((xmlChar *) "1.0");
+ xmlDocSetRootElement(rdoc, res);
+ }
+ else
+ {
+ yaz_log(YLOG_FATAL, "Unknown native_syntax in normalize_record");
+ exit(1);
}
- wrbuf_putc(s->wrbuf, '\0');
- obuf = (unsigned char*) nmem_strdup(s->nmem, wrbuf_buf(s->wrbuf));
- for (p = obuf; *p; p++)
- if (*p == '&' || *p == '<' || *p > 122 || *p < ' ')
- *p = ' ';
- return (char*) obuf;
-}
-
-// Extract 245 $a $b 100 $a
-char *extract_mergekey(struct session *s, const char *rec)
-{
- const char *field, *subfield;
- char *e, *ef;
- char *out, *p, *pout;
- wrbuf_rewind(s->wrbuf);
+ if (global_parameters.dump_records)
+ {
+ fprintf(stderr, "Input Record (normalized):\n----------------\n");
+#if LIBXML_VERSION >= 20600
+ xmlDocFormatDump(stderr, rdoc, 1);
+#else
+ xmlDocDump(stderr, rdoc);
+#endif
+ }
- if (!(field = find_field(rec, "245")))
- return 0;
- if (!(subfield = find_subfield(field, 'a')))
- return 0;
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
+ for (m = rprofile->maplist; m; m = m->next)
{
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- if ((subfield = find_subfield(field, 'b')))
+ xmlDoc *new;
+ if (m->type != Map_xslt)
{
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
- {
- wrbuf_puts(s->wrbuf, " field ");
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- }
+ yaz_log(YLOG_WARN, "Unknown map type");
+ return 0;
}
- }
- if ((field = find_field(rec, "100")))
- {
- if ((subfield = find_subfield(field, 'a')))
+ if (!(new = xsltApplyStylesheet(m->stylesheet, rdoc, 0)))
{
- ef = index(subfield, '\n');
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- if (ef)
- {
- wrbuf_puts(s->wrbuf, " field ");
- wrbuf_write(s->wrbuf, subfield, ef - subfield);
- }
+ yaz_log(YLOG_WARN, "XSLT transformation failed");
+ return 0;
}
+ xmlFreeDoc(rdoc);
+ rdoc = new;
}
- wrbuf_putc(s->wrbuf, '\0');
- p = wrbuf_buf(s->wrbuf);
- out = pout = nmem_malloc(s->nmem, strlen(p) + 1);
-
- while (*p)
+ if (global_parameters.dump_records)
{
- while (isalnum(*p))
- *(pout++) = tolower(*(p++));
- while (*p && !isalnum(*p))
- p++;
- *(pout++) = ' ';
+ fprintf(stderr, "Record:\n----------------\n");
+#if LIBXML_VERSION >= 20600
+ xmlDocFormatDump(stderr, rdoc, 1);
+#else
+ xmlDocDump(stderr, rdoc);
+#endif
}
- if (out != pout)
- *(--pout) = '\0';
-
- return out;
+ return rdoc;
}
-#ifdef RECHEAP
-static void push_record(struct session *s, struct record *r)
+// Extract what appears to be years from buf, storing highest and
+// lowest values.
+static int extract_years(const char *buf, int *first, int *last)
{
- int p;
- assert(s->recheap_max + 1 < s->recheap_size);
-
- s->recheap[p = ++s->recheap_max] = r;
- while (p > 0)
+ *first = -1;
+ *last = -1;
+ while (*buf)
{
- int parent = (p - 1) >> 1;
- if (strcmp(s->recheap[p]->merge_key, s->recheap[parent]->merge_key) < 0)
+ const char *e;
+ int len;
+
+ while (*buf && !isdigit(*buf))
+ buf++;
+ len = 0;
+ for (e = buf; *e && isdigit(*e); e++)
+ len++;
+ if (len == 4)
{
- struct record *tmp;
- tmp = s->recheap[parent];
- s->recheap[parent] = s->recheap[p];
- s->recheap[p] = tmp;
- p = parent;
+ int value = atoi(buf);
+ if (*first < 0 || value < *first)
+ *first = value;
+ if (*last < 0 || value > *last)
+ *last = value;
}
- else
- break;
+ buf = e;
}
+ return *first;
}
-static struct record *top_record(struct session *s)
-{
- return s-> recheap_max >= 0 ? s->recheap[0] : 0;
-}
-
-static struct record *pop_record(struct session *s)
+static struct record *ingest_record(struct client *cl, Z_External *rec)
{
+ xmlDoc *xdoc = normalize_record(cl, rec);
+ xmlNode *root, *n;
struct record *res;
- int p = 0;
- int lastnonleaf = (s->recheap_max - 1) >> 1;
+ struct record_cluster *cluster;
+ struct session *se = cl->session;
+ xmlChar *mergekey, *mergekey_norm;
+ xmlChar *type = 0;
+ xmlChar *value = 0;
+ struct conf_service *service = global_parameters.server->service;
- if (s->recheap_max < 0)
+ if (!xdoc)
return 0;
- res = s->recheap[0];
-
- s->recheap[p] = s->recheap[s->recheap_max--];
-
- while (p <= lastnonleaf)
+ root = xmlDocGetRootElement(xdoc);
+ if (!(mergekey = xmlGetProp(root, (xmlChar *) "mergekey")))
{
- int right = (p + 1) << 1;
- int left = right - 1;
- int min = left;
-
- if (right < s->recheap_max &&
- strcmp(s->recheap[right]->merge_key, s->recheap[left]->merge_key) < 0)
- min = right;
- if (strcmp(s->recheap[min]->merge_key, s->recheap[p]->merge_key) < 0)
- {
- struct record *tmp = s->recheap[min];
- s->recheap[min] = s->recheap[p];
- s->recheap[p] = tmp;
- p = min;
- }
- else
- break;
+ yaz_log(YLOG_WARN, "No mergekey found in record");
+ xmlFreeDoc(xdoc);
+ return 0;
}
- return res;
-}
-
-// Like pop_record but collapses identical (merge_key) records
-// The heap will contain multiple independent matching records and possibly
-// one cluster, created the last time the list was scanned
-static struct record *pop_mrecord(struct session *s)
-{
- struct record *this;
- struct record *next;
- if (!(this = pop_record(s)))
+ res = nmem_malloc(se->nmem, sizeof(struct record));
+ res->next = 0;
+ res->client = cl;
+ res->metadata = nmem_malloc(se->nmem,
+ sizeof(struct record_metadata*) * service->num_metadata);
+ memset(res->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
+
+ mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey);
+ xmlFree(mergekey);
+ normalize_mergekey((char *) mergekey_norm, 0);
+
+ 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 (!cluster)
+ {
+ /* no room for record */
+ xmlFreeDoc(xdoc);
return 0;
+ }
+ relevance_newrec(se->relevance, cluster);
- // Collapse identical records
- while ((next = top_record(s)))
+ for (n = root->children; n; n = n->next)
{
- struct record *p, *tmpnext;
- if (strcmp(this->merge_key, next->merge_key))
- break;
- // Absorb record (and clustersiblings) into a supercluster
- for (p = next; p; p = tmpnext) {
- tmpnext = p->next_cluster;
- p->next_cluster = this->next_cluster;
- this->next_cluster = p;
- }
+ if (type)
+ xmlFree(type);
+ if (value)
+ xmlFree(value);
+ type = value = 0;
- pop_record(s);
- }
- return this;
-}
+ if (n->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) n->name, "metadata"))
+ {
+ struct conf_metadata *md = 0;
+ struct conf_sortkey *sk = 0;
+ struct record_metadata **wheretoput, *newm;
+ int imeta;
+ int first, last;
-// Reads records in sort order. Store records in top of heapspace until rewind is called.
-static struct record *read_recheap(struct session *s)
-{
- struct record *r = pop_mrecord(s);
+ type = xmlGetProp(n, (xmlChar *) "type");
+ value = xmlNodeListGetString(xdoc, n->children, 0);
- if (r)
- {
- if (s->recheap_scratch < 0)
- s->recheap_scratch = s->recheap_size;
- s->recheap[--s->recheap_scratch] = r;
- }
+ if (!type || !value)
+ continue;
- return r;
-}
+ // First, find out what field we're looking at
+ for (imeta = 0; imeta < service->num_metadata; imeta++)
+ if (!strcmp((const char *) type, service->metadata[imeta].name))
+ {
+ md = &service->metadata[imeta];
+ if (md->sortkey_offset >= 0)
+ sk = &service->sortkeys[md->sortkey_offset];
+ break;
+ }
+ if (!md)
+ {
+ yaz_log(YLOG_WARN, "Ignoring unknown metadata element: %s", type);
+ continue;
+ }
-// Return records to heap after read
-static void rewind_recheap(struct session *s)
-{
- while (s->recheap_scratch >= 0) {
- push_record(s, s->recheap[s->recheap_scratch++]);
- if (s->recheap_scratch >= s->recheap_size)
- s->recheap_scratch = -1;
- }
-}
+ // Find out where we are putting it
+ if (md->merge == Metadata_merge_no)
+ wheretoput = &res->metadata[imeta];
+ else
+ wheretoput = &cluster->metadata[imeta];
+
+ // Put it there
+ newm = nmem_malloc(se->nmem, sizeof(struct record_metadata));
+ newm->next = 0;
+ if (md->type == Metadata_type_generic)
+ {
+ char *p, *pe;
+ for (p = (char *) value; *p && isspace(*p); p++)
+ ;
+ for (pe = p + strlen(p) - 1;
+ pe > p && strchr(" ,/.:([", *pe); pe--)
+ *pe = '\0';
+ newm->data.text = nmem_strdup(se->nmem, p);
+ }
+ else if (md->type == Metadata_type_year)
+ {
+ if (extract_years((char *) value, &first, &last) < 0)
+ continue;
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Unknown type in metadata element %s", type);
+ continue;
+ }
+ if (md->type == Metadata_type_year && md->merge != Metadata_merge_range)
+ {
+ yaz_log(YLOG_WARN, "Only range merging supported for years");
+ continue;
+ }
+ if (md->merge == Metadata_merge_unique)
+ {
+ struct record_metadata *mnode;
+ for (mnode = *wheretoput; mnode; mnode = mnode->next)
+ if (!strcmp((const char *) mnode->data.text, newm->data.text))
+ break;
+ if (!mnode)
+ {
+ newm->next = *wheretoput;
+ *wheretoput = newm;
+ }
+ }
+ else if (md->merge == Metadata_merge_longest)
+ {
+ if (!*wheretoput ||
+ strlen(newm->data.text) > strlen((*wheretoput)->data.text))
+ {
+ *wheretoput = newm;
+ if (sk)
+ {
+ char *s = nmem_strdup(se->nmem, newm->data.text);
+ if (!cluster->sortkeys[md->sortkey_offset])
+ cluster->sortkeys[md->sortkey_offset] =
+ nmem_malloc(se->nmem, sizeof(union data_types));
+ normalize_mergekey(s,
+ (sk->type == Metadata_sortkey_skiparticle));
+ cluster->sortkeys[md->sortkey_offset]->text = s;
+ }
+ }
+ }
+ else if (md->merge == Metadata_merge_all || md->merge == Metadata_merge_no)
+ {
+ newm->next = *wheretoput;
+ *wheretoput = newm;
+ }
+ else if (md->merge == Metadata_merge_range)
+ {
+ assert(md->type == Metadata_type_year);
+ if (!*wheretoput)
+ {
+ *wheretoput = newm;
+ (*wheretoput)->data.number.min = first;
+ (*wheretoput)->data.number.max = last;
+ if (sk)
+ cluster->sortkeys[md->sortkey_offset] = &newm->data;
+ }
+ else
+ {
+ if (first < (*wheretoput)->data.number.min)
+ (*wheretoput)->data.number.min = first;
+ if (last > (*wheretoput)->data.number.max)
+ (*wheretoput)->data.number.max = last;
+ }
+#ifdef GAGA
+ if (sk)
+ {
+ union data_types *sdata = cluster->sortkeys[md->sortkey_offset];
+ yaz_log(YLOG_LOG, "SK range: %d-%d", sdata->number.min, sdata->number.max);
+ }
#endif
+ }
+ else
+ yaz_log(YLOG_WARN, "Don't know how to merge on element name %s", md->name);
-// FIXME needs to be generalized. Should flexibly generate X lists per search
-static void extract_subject(struct session *s, const char *rec)
-{
- const char *field, *subfield;
-
- while ((field = find_field(rec, "650")))
- {
- rec = field;
- if ((subfield = find_subfield(field, 'a')))
- {
- char *e, *ef;
- char buf[1024];
- int len;
-
- ef = index(subfield, '\n');
- if (!ef)
- return;
- if ((e = index(subfield, '\t')) && e < ef)
- ef = e;
- while (ef > subfield && !isalpha(*(ef - 1)) && *(ef - 1) != ')')
- ef--;
- len = ef - subfield;
- assert(len < 1023);
- memcpy(buf, subfield, len);
- buf[len] = '\0';
- if (*buf)
- termlist_insert(s->termlist, buf);
+ if (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, (char *) type, year);
+ if (first != last)
+ {
+ sprintf(year, "%d", first);
+ add_facet(se, (char *) type, year);
+ }
+ }
+ else
+ add_facet(se, (char *) type, (char *) value);
+ }
+ xmlFree(type);
+ xmlFree(value);
+ type = value = 0;
}
+ else
+ yaz_log(YLOG_WARN, "Unexpected element %s in internal record", n->name);
}
-}
+ if (type)
+ xmlFree(type);
+ if (value)
+ xmlFree(value);
-static void pull_relevance_field(struct session *s, struct record *head, const char *rec,
- char *field, int mult)
-{
- const char *fb;
- while ((fb = find_field(rec, field)))
- {
- char *ffield = strchr(fb, '\t');
- if (!ffield)
- return;
- char *eol = strchr(ffield, '\n');
- if (!eol)
- return;
- relevance_countwords(s->relevance, head, ffield, eol - ffield, mult);
- rec = field + 1; // Crude way to cause a loop through repeating fields
- }
-}
+ xmlFreeDoc(xdoc);
-static void pull_relevance_keys(struct session *s, struct record *head, struct record *rec)
-{
- relevance_newrec(s->relevance, head);
- pull_relevance_field(s, head, rec->buf, "100", 2);
- pull_relevance_field(s, head, rec->buf, "245", 4);
- //pull_relevance_field(s, head, rec->buf, "530", 1);
- pull_relevance_field(s, head, rec->buf, "630", 1);
- pull_relevance_field(s, head, rec->buf, "650", 1);
- pull_relevance_field(s, head, rec->buf, "700", 1);
- relevance_donerecord(s->relevance, head);
+ relevance_donerecord(se->relevance, cluster);
+ se->total_records++;
+
+ return res;
}
-static struct record *ingest_record(struct client *cl, char *buf, int len)
+// Retrieve first defined value for 'name' for given database.
+// Will be extended to take into account user associated with session
+char *session_setting_oneval(struct session *s, struct database *db, const char *name)
{
- struct session *se = cl->session;
- struct record *res;
- struct record *head;
- const char *recbuf;
+ int offset = settings_offset(name);
- wrbuf_rewind(se->wrbuf);
- yaz_marc_xml(global_parameters.yaz_marc, YAZ_MARC_LINE);
- if (yaz_marc_decode_wrbuf(global_parameters.yaz_marc, buf, len, se->wrbuf) < 0)
- {
- yaz_log(YLOG_WARN, "Failed to decode MARC record");
+ if (offset < 0)
return 0;
- }
- wrbuf_putc(se->wrbuf, '\0');
- recbuf = wrbuf_buf(se->wrbuf);
-
- res = nmem_malloc(se->nmem, sizeof(struct record));
- res->buf = nmem_strdup(se->nmem, recbuf);
-
- extract_subject(se, res->buf);
-
- res->title = extract_title(se, res->buf);
- res->merge_key = extract_mergekey(se, res->buf);
- if (!res->merge_key)
+ if (!db->settings[offset])
return 0;
- res->client = cl;
- res->next_cluster = 0;
- res->target_offset = -1;
- res->term_frequency_vec = 0;
-
- head = reclist_insert(se->reclist, res);
-
- pull_relevance_keys(se, head, res);
-
- se->total_records++;
-
- return res;
+ return db->settings[offset]->value;
}
static void ingest_records(struct client *cl, Z_Records *r)
{
+#if USE_TIMING
+ yaz_timing_t t = yaz_timing_create();
+#endif
struct record *rec;
struct session *s = cl->session;
Z_NamePlusRecordList *rlist;
for (i = 0; i < rlist->num_records; i++)
{
Z_NamePlusRecord *npr = rlist->records[i];
- Z_External *e;
- char *buf;
- int len;
+ cl->records++;
if (npr->which != Z_NamePlusRecord_databaseRecord)
{
yaz_log(YLOG_WARN, "Unexpected record type, probably diagnostic");
continue;
}
- e = npr->u.databaseRecord;
- if (e->which != Z_External_octet)
- {
- yaz_log(YLOG_WARN, "Unexpected external branch, probably BER");
- continue;
- }
- buf = (char*) e->u.octet_aligned->buf;
- len = e->u.octet_aligned->len;
- rec = ingest_record(cl, buf, len);
+ rec = ingest_record(cl, npr->u.databaseRecord);
if (!rec)
continue;
}
if (s->watchlist[SESSION_WATCH_RECORDS].fun && rlist->num_records)
session_alert_watch(s, SESSION_WATCH_RECORDS);
+
+#if USE_TIMING
+ yaz_timing_stop(t);
+ yaz_log(YLOG_LOG, "ingest_records %6.5f %3.2f %3.2f",
+ yaz_timing_get_real(t), yaz_timing_get_user(t),
+ yaz_timing_get_sys(t));
+ yaz_timing_destroy(&t);
+#endif
}
static void do_presentResponse(IOCHAN i, Z_APDU *a)
if (!*r->presentStatus && cl->state != Client_Error)
{
yaz_log(YLOG_DEBUG, "Good Present response");
- cl->records += *r->numberOfRecordsReturned;
ingest_records(cl, r->records);
cl->state = Client_Idle;
}
se = cl->session;
else
{
- yaz_log(YLOG_WARN, "Destroying orphan connection (fix me?)");
+ yaz_log(YLOG_WARN, "Destroying orphan connection");
connection_destroy(co);
return;
}
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 failed?");
- 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;
if (co)
{
if (co->state == Conn_Connecting)
+ {
cl->state = Client_Connecting;
+ iochan_setflag(co->iochan, EVENT_OUTPUT);
+ }
else if (co->state == Conn_Open)
{
if (cl->state == Client_Error || cl->state == Client_Disconnected)
cl->state = Client_Idle;
+ iochan_setflag(co->iochan, EVENT_OUTPUT);
}
- iochan_setflag(co->iochan, EVENT_OUTPUT);
return 1;
}
else
return 0;
}
+#ifdef GAGA // Moved to database.c
+
+// This function will most likely vanish when a proper target profile mechanism is
+// introduced.
void load_simpletargets(const char *fn)
{
FILE *f = fopen(fn, "r");
while (fgets(line, 255, f))
{
char *url, *db;
+ char *name;
struct host *host;
struct database *database;
if (strncmp(line, "target ", 7))
continue;
+ line[strlen(line) - 1] = '\0';
+
+ if ((name = strchr(line, ';')))
+ *(name++) = '\0';
+
url = line + 7;
- url[strlen(url) - 1] = '\0';
- yaz_log(YLOG_DEBUG, "Target: %s", url);
if ((db = strchr(url, '/')))
*(db++) = '\0';
else
db = "Default";
+ 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)
{
}
assert(addrinfo->ai_family == PF_INET);
memcpy(addrbuf, &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4);
- sprintf(ipport, "%hhd.%hhd.%hhd.%hhd:%s",
+ sprintf(ipport, "%u.%u.%u.%u:%s",
addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
host->ipport = xstrdup(ipport);
freeaddrinfo(addrinfo);
strcpy(database->url, url);
strcat(database->url, "/");
strcat(database->url, db);
+ if (name)
+ database->name = xstrdup(name);
+ else
+ database->name = 0;
database->databases = xmalloc(2 * sizeof(char *));
database->databases[0] = xstrdup(db);
database->databases[1] = 0;
database->errors = 0;
+ database->qprofile = 0;
+ database->rprofile = database_retrieval_profile(database);
database->next = databases;
databases = database;
fclose(f);
}
-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;
-}
+#endif
static struct client *client_create(void)
{
s->watchlist[what].data = 0;
}
+//callback for grep_databases
+static void select_targets_callback(void *context, struct database *db)
+{
+ struct session *se = (struct session*) context;
+ struct client *cl = client_create();
+ cl->database = db;
+ cl->session = se;
+ cl->next = se->clients;
+ se->clients = cl;
+}
+
// This should be extended with parameters to control selection criteria
// Associates a set of clients with a session;
-int select_targets(struct session *se)
+int select_targets(struct session *se, struct database_criterion *crit)
{
- struct database *db;
- int c = 0;
-
while (se->clients)
client_destroy(se->clients);
- for (db = databases; db; db = db->next)
+
+ return grep_databases(se, crit, select_targets_callback);
+}
+
+int session_active_clients(struct session *s)
+{
+ struct client *c;
+ int res = 0;
+
+ for (c = s->clients; c; c = c->next)
+ if (c->connection && (c->state == Client_Connecting ||
+ c->state == Client_Initializing ||
+ c->state == Client_Searching ||
+ c->state == Client_Presenting))
+ res++;
+
+ return res;
+}
+
+// parses crit1=val1,crit2=val2|val3,...
+static struct database_criterion *parse_filter(NMEM m, const char *buf)
+{
+ struct database_criterion *res = 0;
+ char **values;
+ int num;
+ int i;
+
+ if (!buf || !*buf)
+ return 0;
+ nmem_strsplit(m, ",", buf, &values, &num);
+ for (i = 0; i < num; i++)
{
- struct client *cl = client_create();
- cl->database = db;
- cl->session = se;
- cl->next = se->clients;
- se->clients = cl;
- c++;
+ char **subvalues;
+ int subnum;
+ int subi;
+ struct database_criterion *new = nmem_malloc(m, sizeof(*new));
+ char *eq = strchr(values[i], '=');
+ if (!eq)
+ {
+ yaz_log(YLOG_WARN, "Missing equal-sign in filter");
+ return 0;
+ }
+ *(eq++) = '\0';
+ new->name = values[i];
+ 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;
}
- return c;
+ return res;
}
-char *search(struct session *se, char *query)
+char *search(struct session *se, char *query, char *filter)
{
int live_channels = 0;
struct client *cl;
+ struct database_criterion *criteria;
yaz_log(YLOG_DEBUG, "Search");
+ nmem_reset(se->nmem);
+ criteria = parse_filter(se->nmem, filter);
strcpy(se->query, query);
se->requestid++;
- nmem_reset(se->nmem);
+ // Release any existing clients
+ select_targets(se, criteria);
for (cl = se->clients; cl; cl = cl->next)
{
- cl->hits = -1;
- cl->records = 0;
- cl->diagnostic = 0;
-
if (client_prep_connection(cl))
live_channels++;
}
if (live_channels)
{
- char *p[512];
int maxrecs = live_channels * global_parameters.toget;
- se->termlist = termlist_create(se->nmem, maxrecs, 15);
+ 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);
- se->total_records = se->total_hits = 0;
+ // This will be initialized in send_search()
+ se->relevance = 0;
+ se->total_records = se->total_hits = se->total_merged = 0;
+ se->expected_maxrecs = maxrecs;
}
else
return "NOTARGETS";
while (s->clients)
client_destroy(s->clients);
nmem_destroy(s->nmem);
- wrbuf_free(s->wrbuf, 1);
+ wrbuf_destroy(s->wrbuf);
}
struct session *new_session()
session->total_hits = 0;
session->total_records = 0;
- session->termlist = 0;
+ session->num_termlists = 0;
session->reclist = 0;
session->requestid = -1;
session->clients = 0;
+ session->expected_maxrecs = 0;
session->query[0] = '\0';
session->nmem = nmem_create();
session->wrbuf = wrbuf_alloc();
session->watchlist[i].fun = 0;
}
- select_targets(session);
-
return session;
}
*count = 0;
for (cl = se->clients; cl; cl = cl->next)
{
- strcpy(res[*count].id, cl->database->host->hostport);
+ res[*count].id = cl->database->url;
+ res[*count].name = cl->database->name;
res[*count].hits = cl->hits;
res[*count].records = cl->records;
res[*count].diagnostic = cl->diagnostic;
return res;
}
-struct termlist_score **termlist(struct session *s, int *num)
+struct termlist_score **termlist(struct session *s, const char *name, int *num)
{
- return termlist_highscore(s->termlist, num);
+ int i;
+
+ for (i = 0; i < s->num_termlists; i++)
+ if (!strcmp((const char *) s->termlists[i].name, name))
+ return termlist_highscore(s->termlists[i].termlist, num);
+ return 0;
}
+#ifdef MISSING_HEADERS
void report_nmem_stats(void)
{
size_t in_use, is_free;
yaz_log(YLOG_LOG, "nmem stat: use=%ld free=%ld",
(long) in_use, (long) is_free);
}
+#endif
+
+struct record_cluster *show_single(struct session *s, int id)
+{
+ struct record_cluster *r;
+
+ reclist_rewind(s->reclist);
+ while ((r = reclist_read_record(s->reclist)))
+ if (r->recid == id)
+ return r;
+ return 0;
+}
-struct record **show(struct session *s, int start, int *num, int *total,
- int *sumhits, NMEM nmem_show)
+struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
+ int *num, int *total, int *sumhits, NMEM nmem_show)
{
- struct record **recs = nmem_malloc(nmem_show, *num
- * sizeof(struct record *));
+ struct record_cluster **recs = nmem_malloc(nmem_show, *num
+ * sizeof(struct record_cluster *));
+ struct reclist_sortparms *spp;
int i;
+#if USE_TIMING
+ yaz_timing_t t = yaz_timing_create();
+#endif
- relevance_prepare_read(s->relevance, s->reclist);
+ for (spp = sp; spp; spp = spp->next)
+ if (spp->type == Metadata_sortkey_relevance)
+ {
+ relevance_prepare_read(s->relevance, s->reclist);
+ break;
+ }
+ reclist_sort(s->reclist, sp);
*total = s->reclist->num_records;
*sumhits = s->total_hits;
if (!reclist_read_record(s->reclist))
{
*num = 0;
- return 0;
+ recs = 0;
+ break;
}
for (i = 0; i < *num; i++)
{
- struct record *r = reclist_read_record(s->reclist);
+ struct record_cluster *r = reclist_read_record(s->reclist);
if (!r)
{
*num = i;
}
recs[i] = r;
}
+#if USE_TIMING
+ yaz_timing_stop(t);
+ yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f",
+ yaz_timing_get_real(t), yaz_timing_get_user(t),
+ yaz_timing_get_sys(t));
+ yaz_timing_destroy(&t);
+#endif
return recs;
}
struct client *cl;
int count = 0;
- bzero(stat, sizeof(*stat));
+ memset(stat, 0, sizeof(*stat));
for (cl = se->clients; cl; cl = cl->next)
{
if (!cl->connection)
stat->num_clients = count;
}
-static CCL_bibset load_cclfile(const char *fn)
+static void start_http_listener(void)
{
- CCL_bibset res = ccl_qual_mk();
- if (ccl_qual_fname(res, fn) < 0)
+ char hp[128] = "";
+ struct conf_server *ser = global_parameters.server;
+
+ if (*global_parameters.listener_override)
+ strcpy(hp, global_parameters.listener_override);
+ else
{
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", fn);
- exit(1);
+ strcpy(hp, ser->host ? ser->host : "");
+ if (ser->port)
+ {
+ if (*hp)
+ strcat(hp, ":");
+ sprintf(hp + strlen(hp), "%d", ser->port);
+ }
}
- return res;
+ 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] = "";
+ struct conf_server *ser = global_parameters.server;
+
+ if (*global_parameters.proxy_override)
+ strcpy(hp, global_parameters.proxy_override);
+ else if (ser->proxy_host || ser->proxy_port)
+ {
+ strcpy(hp, ser->proxy_host ? ser->proxy_host : "");
+ if (ser->proxy_port)
+ {
+ if (*hp)
+ strcat(hp, ":");
+ sprintf(hp + strlen(hp), "%d", ser->proxy_port);
+ }
+ }
+ else
+ return;
+
+ 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;
char *arg;
- int setport = 0;
- if (signal(SIGPIPE, SIG_IGN) < 0)
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0);
- while ((ret = options("c:h:p:C:s:", argv, argc, &arg)) != -2)
+ while ((ret = options("t:f:x:h:p:z:s:d", argv, argc, &arg)) != -2)
{
switch (ret) {
- case 'c':
- command_init(atoi(arg));
- setport++;
- break;
- case 'h':
- http_init(arg);
- setport++;
+ case 'f':
+ if (!read_config(arg))
+ exit(1);
break;
- case 'C':
- global_parameters.ccl_filter = load_cclfile(arg);
+ case 'h':
+ strcpy(global_parameters.listener_override, arg);
break;
case 'p':
- http_set_proxyaddr(arg);
+ 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;
+ case 'd':
+ global_parameters.dump_records = 1;
+ break;
default:
fprintf(stderr, "Usage: pazpar2\n"
+ " -f configfile\n"
" -h [host:]port (REST protocol listener)\n"
- " -c cmdport (telnet-style)\n"
" -C cclconfig\n"
" -s simpletargetfile\n"
- " -p hostname[:portno] (HTTP proxy)\n");
+ " -p hostname[:portno] (HTTP proxy)\n"
+ " -z hostname[:portno] (Z39.50 proxy)\n"
+ " -d (show internal records)\n");
exit(1);
}
}
- if (!setport)
+ if (!config)
{
- fprintf(stderr, "Set command port with -h or -c\n");
+ yaz_log(YLOG_FATAL, "Load config with -f");
exit(1);
}
+ global_parameters.server = config->servers;
+
+ start_http_listener();
+ start_proxy();
+ start_zproxy();
- global_parameters.ccl_filter = load_cclfile("default.bib");
+ 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);