-/* $Id: client.c,v 1.18 2007-08-17 12:39:11 adam Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2008 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
for more details.
You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
/** \file client.c
\brief Z39.50 client
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
#include <signal.h>
#include <ctype.h>
#include <assert.h>
#include <yaz/oid_db.h>
#include <yaz/diagbib1.h>
-#if HAVE_CONFIG_H
-#include "cconfig.h"
-#endif
-
#define USE_TIMING 0
#if USE_TIMING
#include <yaz/timing.h>
#endif
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
#include "pazpar2.h"
struct show_raw {
int active; // whether this request has been sent to the server
int position;
+ int binary;
char *syntax;
char *esn;
void (*error_handler)(void *data, const char *addinfo);
void (*record_handler)(void *data, const char *buf, size_t sz);
void *data;
+ struct show_raw *next;
};
static const char *client_states[] = {
"Client_Error",
"Client_Failed",
"Client_Disconnected",
- "Client_Stopped"
+ "Client_Stopped",
+ "Client_Continue"
};
static struct client *client_freelist = 0;
void client_set_state(struct client *cl, enum client_state st)
{
cl->state = st;
+ if (cl->session)
+ {
+ int no_active = session_active_clients(cl->session);
+ if (no_active == 0)
+ session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+ }
}
static void client_show_raw_error(struct client *cl, const char *addinfo);
client_show_raw_error(cl, "client connection failure");
yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
connection_destroy(cl->connection);
- cl->state = Client_Error;
+ client_set_state(cl, Client_Error);
}
void *data,
void (*error_handler)(void *data, const char *addinfo),
void (*record_handler)(void *data, const char *buf,
- size_t sz))
+ size_t sz),
+ void **data2,
+ int binary)
{
- if (cl->show_raw)
+ struct show_raw *rr, **rrp;
+ if (!cl->connection)
+ { /* the client has no connection */
return -1;
- cl->show_raw = xmalloc(sizeof(*cl->show_raw));
- cl->show_raw->position = position;
- cl->show_raw->active = 0;
- cl->show_raw->data = data;
- cl->show_raw->error_handler = error_handler;
- cl->show_raw->record_handler = record_handler;
+ }
+ rr = xmalloc(sizeof(*rr));
+ *data2 = rr;
+ rr->position = position;
+ rr->active = 0;
+ rr->data = data;
+ rr->error_handler = error_handler;
+ rr->record_handler = record_handler;
+ rr->binary = binary;
if (syntax)
- cl->show_raw->syntax = xstrdup(syntax);
+ rr->syntax = xstrdup(syntax);
else
- cl->show_raw->syntax = 0;
+ rr->syntax = 0;
if (esn)
- cl->show_raw->esn = xstrdup(esn);
+ rr->esn = xstrdup(esn);
else
- cl->show_raw->esn = 0;
+ rr->esn = 0;
+ rr->next = 0;
+
+ for (rrp = &cl->show_raw; *rrp; rrp = &(*rrp)->next)
+ ;
+ *rrp = rr;
-
if (cl->state == Client_Failed)
{
client_show_raw_error(cl, "client failed");
return 0;
}
-void client_show_raw_reset(struct client *cl)
+void client_show_raw_remove(struct client *cl, void *data)
+{
+ struct show_raw *rr = data;
+ struct show_raw **rrp = &cl->show_raw;
+ while (*rrp != rr)
+ rrp = &(*rrp)->next;
+ if (*rrp)
+ {
+ *rrp = rr->next;
+ xfree(rr);
+ }
+}
+
+void client_show_raw_dequeue(struct client *cl)
{
- xfree(cl->show_raw);
- cl->show_raw = 0;
+ struct show_raw *rr = cl->show_raw;
+
+ cl->show_raw = rr->next;
+ xfree(rr);
}
static void client_show_raw_error(struct client *cl, const char *addinfo)
{
- if (cl->show_raw)
+ while (cl->show_raw)
{
cl->show_raw->error_handler(cl->show_raw->data, addinfo);
- client_show_raw_reset(cl);
+ client_show_raw_dequeue(cl);
}
}
static void client_show_raw_cancel(struct client *cl)
{
- if (cl->show_raw)
+ while (cl->show_raw)
{
cl->show_raw->error_handler(cl->show_raw->data, "cancel");
- client_show_raw_reset(cl);
+ client_show_raw_dequeue(cl);
}
}
yaz_log(YLOG_DEBUG, "Init response %s", cl->database->database->url);
if (*r->result)
- cl->state = Client_Idle;
+ cl->state = Client_Continue;
else
cl->state = Client_Failed; // FIXME need to do something to the connection
}
return;
}
+ if (cl->show_raw && cl->show_raw->binary)
+ {
+ Z_External *rec = npr->u.databaseRecord;
+ if (rec->which == Z_External_octet)
+ {
+ cl->show_raw->record_handler(cl->show_raw->data,
+ (const char *)
+ rec->u.octet_aligned->buf,
+ rec->u.octet_aligned->len);
+ client_show_raw_dequeue(cl);
+ }
+ else
+ client_show_raw_error(cl, "no records");
+ }
+
doc = record_to_xml(client_get_database(cl), npr->u.databaseRecord);
if (!doc)
{
xmlDocDumpMemory(doc, &buf_out, &len_out);
xmlFreeDoc(doc);
- cl->show_raw->record_handler(cl->show_raw->data,
- (const char *) buf_out, len_out);
-
+ if (cl->show_raw)
+ {
+ cl->show_raw->record_handler(cl->show_raw->data,
+ (const char *) buf_out, len_out);
+ client_show_raw_dequeue(cl);
+ }
xmlFree(buf_out);
- xfree(cl->show_raw);
- cl->show_raw = 0;
}
static void ingest_records(struct client *cl, Z_Records *r)
continue;
}
if (rlist->num_records)
- session_alert_watch(s, SESSION_WATCH_RECORDS);
+ session_alert_watch(s, SESSION_WATCH_SHOW);
+ if (rlist->num_records)
+ session_alert_watch(s, SESSION_WATCH_RECORD);
#if USE_TIMING
yaz_timing_stop(t);
if (*r->searchStatus)
{
cl->hits = *r->resultCount;
- se->total_hits += cl->hits;
+ if (cl->hits < 0)
+ {
+ yaz_log(YLOG_WARN, "Target %s returns hit count %d",
+ cl->database->database->url, cl->hits);
+ }
+ else
+ se->total_hits += cl->hits;
if (r->presentStatus && !*r->presentStatus && r->records)
{
yaz_log(YLOG_DEBUG, "Records in search response %s",
cl->database->database->url);
ingest_records(cl, r->records);
}
- cl->state = Client_Idle;
+ cl->state = Client_Continue;
}
else
{ /*"FAILED"*/
}
else
ingest_records(cl, recs);
- cl->state = Client_Idle;
+ cl->state = Client_Continue;
}
else if (*r->presentStatus)
{
if (cl->state == Client_Connected) {
client_init_request(cl);
}
- if (cl->state == Client_Idle)
+ if (cl->state == Client_Continue || cl->state == Client_Idle)
{
struct session *se = client_get_session(cl);
if (cl->requestid != se->requestid && cl->pquery) {
cl->records < cl->hits) {
client_send_present(cl);
}
+ else
+ client_set_state(cl, Client_Idle);
}
}
void client_disconnect(struct client *cl)
{
if (cl->state != Client_Idle)
- cl->state = Client_Disconnected;
+ client_set_state(cl, Client_Disconnected);
client_set_connection(cl, 0);
}
// Initialize relevance structure with query terms
char *p[512];
extract_terms(se->nmem, cn, p);
- se->relevance = relevance_create(client_get_database(cl)->pct,
- se->nmem, (const char **) p,
- se->expected_maxrecs);
+ se->relevance = relevance_create(
+ global_parameters.server->relevance_pct,
+ se->nmem, (const char **) p,
+ se->expected_maxrecs);
}
ccl_rpn_delete(cn);
int client_is_active(struct client *cl)
{
- if (cl->connection && (cl->state == Client_Connecting ||
+ if (cl->connection && (cl->state == Client_Continue ||
+ cl->state == Client_Connecting ||
+ cl->state == Client_Connected ||
cl->state == Client_Initializing ||
cl->state == Client_Searching ||
cl->state == Client_Presenting))