/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#if HAVE_CONFIG_H
#include <config.h>
#endif
-
+#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <yaz/timing.h>
#endif
-#include "pazpar2.h"
-
+#include "ppmutex.h"
+#include "session.h"
+#include "parameters.h"
#include "client.h"
#include "connection.h"
#include "settings.h"
+#include "relevance.h"
+#include "incref.h"
+
+/* client counting (1) , disable client counting (0) */
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_clients = 0;
+
+static void client_use(int delta)
+{
+ if (!g_mutex)
+ yaz_mutex_create(&g_mutex);
+ yaz_mutex_enter(g_mutex);
+ no_clients += delta;
+ yaz_mutex_leave(g_mutex);
+ yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
+}
+#else
+#define client_use(x)
+#endif
/** \brief Represents client state for a connection to one search target */
struct client {
struct session *session;
char *pquery; // Current search
char *cqlquery; // used for SRU targets only
- int hits;
+ Odr_int hits;
int record_offset;
+ int maxrecs;
+ int startrecs;
int diagnostic;
enum client_state state;
struct show_raw *show_raw;
struct client *next; // next client in session or next in free list
+ ZOOM_resultset resultset;
+ YAZ_MUTEX mutex;
+ int ref_count;
};
struct show_raw {
"Client_Disconnected"
};
-static struct client *client_freelist = 0;
-
const char *client_get_state_str(struct client *cl)
{
return client_states[cl->state];
void client_set_state(struct client *cl, enum client_state st)
{
cl->state = st;
- if (cl->session)
+ /* no need to check for all client being non-active if this one
+ already is. Note that session_active_clients also LOCKS session */
+#if 0
+ if (!client_is_active(cl) && cl->session)
{
int no_active = session_active_clients(cl->session);
if (no_active == 0)
session_alert_watch(cl->session, SESSION_WATCH_SHOW);
}
+#endif
}
static void client_show_raw_error(struct client *cl, const char *addinfo);
static int nativesyntax_to_type(struct session_database *sdb, char *type,
ZOOM_record rec);
-static void client_show_immediate(struct client *cl, int position,
- void *data,
- void (*error_handler)(void *data, const char *addinfo),
- void (*record_handler)(void *data, const char *buf,
- size_t sz),
- int binary)
+static void client_show_immediate(
+ ZOOM_resultset resultset, struct session_database *sdb, int position,
+ void *data,
+ void (*error_handler)(void *data, const char *addinfo),
+ void (*record_handler)(void *data, const char *buf, size_t sz),
+ int binary)
{
- struct connection *co = cl->connection;
- struct session_database *sdb = client_get_database(cl);
- ZOOM_resultset resultset = 0;
ZOOM_record rec = 0;
char type[80];
const char *buf;
int len;
- assert(co);
-
- resultset = connection_get_resultset(co);
if (!resultset)
{
error_handler(data, "no resultset");
size_t sz),
int binary)
{
- if (!cl->connection)
- return -1;
-
if (syntax == 0 && esn == 0)
- client_show_immediate(cl, position, data,
+ client_show_immediate(cl->resultset, client_get_database(cl),
+ position, data,
error_handler, record_handler,
binary);
else
{
struct show_raw *rr, **rrp;
+
+ if (!cl->connection)
+ return -1;
+
+
rr = xmalloc(sizeof(*rr));
rr->position = position;
rr->active = 0;
if (cl->state == Client_Failed)
{
- client_show_raw_error(cl, "client failed");
+ client_show_raw_error(cl, "client failed");
}
else if (cl->state == Client_Disconnected)
{
return 0;
}
+static void client_show_raw_delete(struct show_raw *r)
+{
+ xfree(r->syntax);
+ xfree(r->esn);
+ xfree(r);
+}
+
void client_show_raw_remove(struct client *cl, void *data)
{
struct show_raw *rr = data;
if (*rrp)
{
*rrp = rr->next;
- xfree(rr);
+ client_show_raw_delete(rr);
}
}
struct show_raw *rr = cl->show_raw;
cl->show_raw = rr->next;
- xfree(rr);
+ client_show_raw_delete(rr);
}
static void client_show_raw_error(struct client *cl, const char *addinfo)
{
struct session_database *sdb = client_get_database(cl);
struct connection *co = client_get_connection(cl);
- ZOOM_resultset set = connection_get_resultset(co);
+ ZOOM_resultset set = cl->resultset;
int offset = cl->show_raw->position;
const char *syntax = 0;
{
strcpy(type, "xml");
}
+ else if (!strncmp(s, "txml", 4))
+ {
+ const char *cp = strchr(s, ';');
+ yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s");
+ }
else
return -1;
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");
struct connection *co = cl->connection;
struct session *se = cl->session;
ZOOM_connection link = connection_get_link(co);
- ZOOM_resultset resultset = connection_get_resultset(co);
- const char *error, *addinfo;
-
+ ZOOM_resultset resultset = cl->resultset;
+ const char *error, *addinfo = 0;
+
if (ZOOM_connection_error(link, &error, &addinfo))
{
cl->hits = 0;
client_set_state(cl, Client_Error);
yaz_log(YLOG_WARN, "Search error %s (%s): %s",
- error, addinfo, client_get_url(cl));
+ error, addinfo, client_get_url(cl));
}
else
{
- cl->record_offset = 0;
+ cl->record_offset = cl->startrecs;
cl->hits = ZOOM_resultset_size(resultset);
- se->total_hits += cl->hits;
+ if (se)
+ se->total_hits += cl->hits;
}
}
+void client_got_records(struct client *cl)
+{
+ if (cl->session)
+ {
+ session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+ session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+ }
+}
void client_record_response(struct client *cl)
{
struct connection *co = cl->connection;
ZOOM_connection link = connection_get_link(co);
- ZOOM_resultset resultset = connection_get_resultset(co);
+ ZOOM_resultset resultset = cl->resultset;
const char *error, *addinfo;
if (ZOOM_connection_error(link, &error, &addinfo))
if ((rec = ZOOM_resultset_record(resultset, offset)))
{
cl->record_offset++;
- if (ZOOM_record_error(rec, &msg, &addinfo, 0))
+ if (cl->session == 0)
+ ;
+ else if (ZOOM_record_error(rec, &msg, &addinfo, 0))
+ {
yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)",
- error, addinfo, client_get_url(cl),
+ msg, addinfo, client_get_url(cl),
cl->record_offset);
+ }
else
{
struct session_database *sdb = client_get_database(cl);
+ NMEM nmem = nmem_create();
const char *xmlrec;
char type[80];
+
if (nativesyntax_to_type(sdb, type, rec))
yaz_log(YLOG_WARN, "Failed to determine record type");
- if ((xmlrec = ZOOM_record_get(rec, type, NULL)))
+ xmlrec = ZOOM_record_get(rec, type, NULL);
+ if (!xmlrec)
+ yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s",
+ client_get_url(cl));
+ else
{
- if (ingest_record(cl, xmlrec, cl->record_offset))
- {
- session_alert_watch(cl->session, SESSION_WATCH_SHOW);
- session_alert_watch(cl->session, SESSION_WATCH_RECORD);
- }
- else
- yaz_log(YLOG_WARN, "Failed to ingest");
+ if (ingest_record(cl, xmlrec, cl->record_offset, nmem))
+ yaz_log(YLOG_WARN, "Failed to ingest from %s",
+ client_get_url(cl));
}
- else
- yaz_log(YLOG_WARN, "Failed to extract ZOOM record");
+ nmem_destroy(nmem);
}
-
}
else
{
const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS);
const char *opt_sru = session_setting_oneval(sdb, PZ_SRU);
+ const char *opt_sort = session_setting_oneval(sdb, PZ_SORT);
+ char maxrecs_str[24], startrecs_str[24];
assert(link);
ZOOM_connection_option_set(link, "elementSetName", opt_elements);
if (*opt_requestsyn)
ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn);
- if (*opt_maxrecs)
- ZOOM_connection_option_set(link, "count", opt_maxrecs);
- else
+
+ if (!*opt_maxrecs)
{
- char n[128];
- sprintf(n, "%d", global_parameters.toget);
- ZOOM_connection_option_set(link, "count", n);
+ sprintf(maxrecs_str, "%d", cl->maxrecs);
+ opt_maxrecs = maxrecs_str;
}
+ ZOOM_connection_option_set(link, "count", opt_maxrecs);
+
+
+ if (atoi(opt_maxrecs) > 20)
+ ZOOM_connection_option_set(link, "presentChunk", "20");
+ else
+ ZOOM_connection_option_set(link, "presentChunk", opt_maxrecs);
+
+ sprintf(startrecs_str, "%d", cl->startrecs);
+ ZOOM_connection_option_set(link, "start", startrecs_str);
+
if (databaseName)
ZOOM_connection_option_set(link, "databaseName", databaseName);
- ZOOM_connection_option_set(link, "presentChunk", "20");
-
if (cl->cqlquery)
{
ZOOM_query q = ZOOM_query_create();
yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery);
ZOOM_query_cql(q, cl->cqlquery);
+ if (*opt_sort)
+ ZOOM_query_sortby(q, opt_sort);
rs = ZOOM_connection_search(link, q);
ZOOM_query_destroy(q);
}
yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
rs = ZOOM_connection_search_pqf(link, cl->pquery);
}
- connection_set_resultset(co, rs);
+ ZOOM_resultset_destroy(cl->resultset);
+ cl->resultset = rs;
connection_continue(co);
}
struct client *client_create(void)
{
- struct client *r;
- if (client_freelist)
- {
- r = client_freelist;
- client_freelist = client_freelist->next;
- }
- else
- r = xmalloc(sizeof(struct client));
+ struct client *r = xmalloc(sizeof(*r));
+ r->maxrecs = 100;
+ r->startrecs = 0;
r->pquery = 0;
r->cqlquery = 0;
r->database = 0;
r->diagnostic = 0;
r->state = Client_Disconnected;
r->show_raw = 0;
+ r->resultset = 0;
r->next = 0;
+ r->mutex = 0;
+ pazpar2_mutex_create(&r->mutex, "client");
+
+ r->ref_count = 1;
+ client_use(1);
+
return r;
}
-void client_destroy(struct client *c)
+void client_incref(struct client *c)
{
- struct session *se = c->session;
- if (c == se->clients)
- se->clients = c->next;
- else
+ pazpar2_incref(&c->ref_count, c->mutex);
+ yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d",
+ c, client_get_url(c), c->ref_count);
+}
+
+int client_destroy(struct client *c)
+{
+ if (c)
{
- struct client *cc;
- for (cc = se->clients; cc && cc->next != c; cc = cc->next)
- ;
- if (cc)
- cc->next = c->next;
+ yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d",
+ c, client_get_url(c), c->ref_count);
+ if (!pazpar2_decref(&c->ref_count, c->mutex))
+ {
+ c->next = 0;
+ xfree(c->pquery);
+ c->pquery = 0;
+ xfree(c->cqlquery);
+ c->cqlquery = 0;
+ assert(!c->connection);
+ assert(!c->resultset);
+
+ yaz_mutex_destroy(&c->mutex);
+ xfree(c);
+ client_use(-1);
+ return 1;
+ }
}
- xfree(c->pquery);
- xfree(c->cqlquery);
-
- if (c->connection)
- connection_release(c->connection);
- c->next = client_freelist;
- client_freelist = c;
+ return 0;
}
void client_set_connection(struct client *cl, struct connection *con)
{
- cl->connection = con;
+ if (cl->resultset)
+ {
+ ZOOM_resultset_destroy(cl->resultset);
+ cl->resultset = 0;
+ }
+ if (con)
+ {
+ assert(cl->connection == 0);
+ cl->connection = con;
+ client_incref(cl);
+ }
+ else
+ {
+ cl->connection = con;
+ client_destroy(cl);
+ }
}
void client_disconnect(struct client *cl)
char *r;
WRBUF wrb = wrbuf_alloc();
int status;
+ ODR odr_out = odr_createmem(ODR_ENCODE);
- zquery = p_query_rpn(global_parameters.odr_out, cl->pquery);
+ zquery = p_query_rpn(odr_out, cl->pquery);
+ yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery)))
{
- yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status);
- return 0;
+ yaz_log(YLOG_WARN, "Failed to generate CQL query, code=%d", status);
+ r = 0;
}
- r = xstrdup(wrbuf_cstr(wrb));
-
+ else
+ {
+ r = xstrdup(wrbuf_cstr(wrb));
+ }
wrbuf_destroy(wrb);
- odr_reset(global_parameters.odr_out); // releases the zquery
+ odr_destroy(odr_out);
cql_transform_close(cqlt);
return r;
}
CCL_bibset ccl_map = prepare_cclmap(cl);
const char *sru = session_setting_oneval(sdb, PZ_SRU);
const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
+ const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME);
if (!ccl_map)
return -1;
if (!cn)
{
client_set_state(cl, Client_Error);
- yaz_log(YLOG_WARN, "Failed to parse query for %s",
- client_get_database(cl)->database->url);
+ yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s",
+ query,
+ client_get_database(cl)->database->url);
return -1;
}
wrbuf_rewind(se->wrbuf);
wrbuf_puts(se->wrbuf, pqf_prefix);
wrbuf_puts(se->wrbuf, " ");
}
- ccl_pquery(se->wrbuf, cn);
+ if (!pqf_strftime || !*pqf_strftime)
+ ccl_pquery(se->wrbuf, cn);
+ else
+ {
+ time_t cur_time = time(0);
+ struct tm *tm = localtime(&cur_time);
+ char tmp_str[300];
+ const char *cp = tmp_str;
+
+ /* see man strftime(3) for things .. In particular %% gets converted
+ to %.. And That's our original query .. */
+ strftime(tmp_str, sizeof(tmp_str)-1, pqf_strftime, tm);
+ for (; *cp; cp++)
+ {
+ if (cp[0] == '%')
+ ccl_pquery(se->wrbuf, cn);
+ else
+ wrbuf_putc(se->wrbuf, cp[0]);
+ }
+ }
xfree(cl->pquery);
cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf));
char *p[512];
extract_terms(se->nmem, cn, p);
se->relevance = relevance_create(
- global_parameters.server->relevance_pct,
- se->nmem, (const char **) p,
- se->expected_maxrecs);
+ se->service->relevance_pct,
+ se->nmem, (const char **) p);
}
ccl_rpn_delete(cn);
return 0;
}
+
+void client_remove_from_session(struct client *c)
+{
+ struct session *se;
+
+ se = c->session;
+ assert(se);
+ if (se)
+ {
+ struct client **ccp = &se->clients;
+
+ while (*ccp && *ccp != c)
+ ccp = &(*ccp)->next;
+ assert(*ccp == c);
+ *ccp = c->next;
+
+ c->database = 0;
+ c->session = 0;
+ c->next = 0;
+ }
+}
+
void client_set_session(struct client *cl, struct session *se)
{
cl->session = se;
}
-int client_get_hits(struct client *cl)
+Odr_int client_get_hits(struct client *cl)
{
return cl->hits;
}
return cl->record_offset;
}
+void client_set_diagnostic(struct client *cl, int diagnostic)
+{
+ cl->diagnostic = diagnostic;
+}
+
int client_get_diagnostic(struct client *cl)
{
return cl->diagnostic;
const char *client_get_url(struct client *cl)
{
- return client_get_database(cl)->database->url;
+ if (cl->database)
+ return client_get_database(cl)->database->url;
+ else
+ return "NOURL";
+}
+
+void client_set_maxrecs(struct client *cl, int v)
+{
+ cl->maxrecs = v;
+}
+
+void client_set_startrecs(struct client *cl, int v)
+{
+ cl->startrecs = v;
}
/*
projects / pazpar2-moved-to-github.git / blobdiff