X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=pazpar2.c;h=4105ba2debf455b955e56d1e88edac6646dede5d;hb=f0fb67815fb47683e2c00a2dea706ac9258c927c;hp=d8d875669bba5f2828a1490da7e2506ebe869678;hpb=0b34234d576c19cdb90e009659754d4dc4353b14;p=pazpar2-moved-to-github.git diff --git a/pazpar2.c b/pazpar2.c index d8d8756..4105ba2 100644 --- a/pazpar2.c +++ b/pazpar2.c @@ -1,4 +1,4 @@ -/* $Id: pazpar2.c,v 1.11 2006-12-08 21:40:58 quinn Exp $ */; +/* $Id: pazpar2.c,v 1.17 2006-12-19 04:49:34 quinn Exp $ */; #include #include @@ -17,8 +17,6 @@ #include #include #include -#include -#include #include "pazpar2.h" #include "eventl.h" @@ -35,8 +33,9 @@ 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); +void session_alert_watch(struct session *s, int what); -IOCHAN channel_list = 0; // Master list of connections we're listening to. +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; @@ -57,25 +56,14 @@ static char *client_states[] = { "Client_Stopped" }; -static struct parameters { - int timeout; /* operations timeout, in seconds */ - char implementationId[128]; - char implementationName[128]; - char implementationVersion[128]; - int target_timeout; // seconds - int toget; - int chunk; - CCL_bibset ccl_filter; - yaz_marc_t yaz_marc; - ODR odr_out; - ODR odr_in; -} global_parameters = +struct parameters global_parameters = { 30, "81", "Index Data PazPar2 (MasterKey)", PAZPAR2_VERSION, 600, // 10 minutes + 60, 100, MAX_CHUNK, 0, @@ -651,6 +639,7 @@ static struct record *ingest_record(struct client *cl, char *buf, int len) static void ingest_records(struct client *cl, Z_Records *r) { struct record *rec; + struct session *s = cl->session; Z_NamePlusRecordList *rlist; int i; @@ -682,6 +671,8 @@ static void ingest_records(struct client *cl, Z_Records *r) if (!rec) continue; } + if (s->watchlist[SESSION_WATCH_RECORDS].fun && rlist->num_records) + session_alert_watch(s, SESSION_WATCH_RECORDS); } static void do_presentResponse(IOCHAN i, Z_APDU *a) @@ -722,6 +713,12 @@ static void handler(IOCHAN i, int event) if (cl) se = cl->session; + else + { + yaz_log(YLOG_WARN, "Destroying orphan connection (fix me?)"); + connection_destroy(co); + return; + } if (co->state == Conn_Connecting && event & EVENT_OUTPUT) { @@ -749,12 +746,14 @@ static void handler(IOCHAN i, int event) if (len < 0) { - client_fatal(cl); + yaz_log(YLOG_WARN|YLOG_ERRNO, "Error reading from Z server"); + connection_destroy(co); return; } else if (len == 0) { - client_fatal(cl); + yaz_log(YLOG_WARN, "EOF reading from Z server"); + connection_destroy(co); return; } else if (len > 1) // We discard input if we have no connection @@ -983,7 +982,7 @@ void load_simpletargets(const char *fn) continue; url = line + 7; url[strlen(url) - 1] = '\0'; - yaz_log(LOG_DEBUG, "Target: %s", url); + yaz_log(YLOG_DEBUG, "Target: %s", url); if ((db = strchr(url, '/'))) *(db++) = '\0'; else @@ -1121,11 +1120,26 @@ void client_destroy(struct client *c) cc->next = c->next; } if (c->connection) - connection_destroy(c->connection); + connection_release(c->connection); c->next = client_freelist; client_freelist = c; } +void session_set_watch(struct session *s, int what, session_watchfun fun, void *data) +{ + s->watchlist[what].fun = fun; + s->watchlist[what].data = data; +} + +void session_alert_watch(struct session *s, int what) +{ + if (!s->watchlist[what].fun) + return; + (*s->watchlist[what].fun)(s->watchlist[what].data); + s->watchlist[what].fun = 0; + s->watchlist[what].data = 0; +} + // This should be extended with parameters to control selection criteria // Associates a set of clients with a session; int select_targets(struct session *se) @@ -1182,8 +1196,18 @@ char *search(struct session *se, char *query) return 0; } +void destroy_session(struct session *s) +{ + yaz_log(YLOG_LOG, "Destroying session"); + while (s->clients) + client_destroy(s->clients); + nmem_destroy(s->nmem); + wrbuf_free(s->wrbuf, 1); +} + struct session *new_session() { + int i; struct session *session = xmalloc(sizeof(*session)); yaz_log(YLOG_DEBUG, "New pazpar2 session"); @@ -1197,17 +1221,17 @@ struct session *new_session() session->query[0] = '\0'; session->nmem = nmem_create(); session->wrbuf = wrbuf_alloc(); + for (i = 0; i <= SESSION_WATCH_MAX; i++) + { + session->watchlist[i].data = 0; + session->watchlist[i].fun = 0; + } select_targets(session); return session; } -void session_destroy(struct session *s) -{ - // FIXME do some shit here!!!! -} - struct hitsbytarget *hitsbytarget(struct session *se, int *count) { static struct hitsbytarget res[1000]; // FIXME MM @@ -1312,7 +1336,7 @@ int main(int argc, char **argv) if (signal(SIGPIPE, SIG_IGN) < 0) yaz_log(YLOG_WARN|YLOG_ERRNO, "signal"); - yaz_log_init(YLOG_DEFAULT_LEVEL|YLOG_DEBUG, "pazpar2", 0); + yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0); while ((ret = options("c:h:p:C:s:", argv, argc, &arg)) != -2) { @@ -1322,7 +1346,7 @@ int main(int argc, char **argv) setport++; break; case 'h': - http_init(atoi(arg)); + http_init(arg); setport++; break; case 'C': @@ -1336,7 +1360,7 @@ int main(int argc, char **argv) break; default: fprintf(stderr, "Usage: pazpar2\n" - " -h httpport (REST)\n" + " -h [host:]port (REST protocol listener)\n" " -c cmdport (telnet-style)\n" " -C cclconfig\n" " -s simpletargetfile\n"