"Client_Disconnected"
};
-static void client_enter(struct client *cl)
-{
- yaz_mutex_enter(cl->mutex);
-}
-
-static void client_leave(struct client *cl)
-{
- yaz_mutex_leave(cl->mutex);
-}
-
-
const char *client_get_state_str(struct client *cl)
{
return client_states[cl->state];
{
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");
client_show_raw_dequeue(cl);
}
-static void search_response(struct client *cl)
+void client_search_response(struct client *cl)
{
struct connection *co = cl->connection;
struct session *se = cl->session;
}
}
-void client_search_response(struct client *cl)
+void client_got_records(struct client *cl)
{
- search_response(cl);
+ if (cl->session)
+ {
+ session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+ session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+ }
}
-static void record_response(struct client *cl)
+void client_record_response(struct client *cl)
{
struct connection *co = cl->connection;
ZOOM_connection link = connection_get_link(co);
if (ingest_record(cl, xmlrec, cl->record_offset, nmem))
yaz_log(YLOG_WARN, "Failed to ingest from %s",
client_get_url(cl));
- else
- {
- session_alert_watch(cl->session, SESSION_WATCH_SHOW);
- session_alert_watch(cl->session, SESSION_WATCH_RECORD);
- }
}
nmem_destroy(nmem);
}
}
}
-void client_record_response(struct client *cl)
-{
- record_response(cl);
-}
-
void client_start_search(struct client *cl)
{
struct session_database *sdb = client_get_database(cl);
void client_incref(struct client *c)
{
pazpar2_incref(&c->ref_count, c->mutex);
- yaz_log(YLOG_LOG, "client_incref %s %d", client_get_url(c), c->ref_count);
+ yaz_log(YLOG_DEBUG, "client_incref %s %d", client_get_url(c), c->ref_count);
}
int client_destroy(struct client *c)
{
if (c)
{
- yaz_log(YLOG_LOG, "client_destroy %s %d",
+ yaz_log(YLOG_DEBUG, "client_destroy %s %d",
client_get_url(c), c->ref_count);
if (!pazpar2_decref(&c->ref_count, c->mutex))
{
c->pquery = 0;
xfree(c->cqlquery);
c->cqlquery = 0;
- c->hits = 12345678;
-#if 0
- if (c->connection)
- connection_release(c->connection);
-#endif
ZOOM_resultset_destroy(c->resultset);
yaz_mutex_destroy(&c->mutex);
xfree(c);
void client_remove_from_session(struct client *c)
{
- struct session *se = c->session;
-
+ struct session *se;
+ client_incref(c);
+
+ se = c->session;
assert(se);
if (se)
{
assert(*ccp == c);
*ccp = c->next;
+ c->database = 0;
c->session = 0;
c->next = 0;
}
+ client_destroy(c);
}
void client_set_session(struct client *cl, struct session *se)
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)