projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mangle ZOOM_resultset in client_set_connection
[pazpar2-moved-to-github.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index
5975b69
..
6f0941a
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-24,7
+24,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if HAVE_CONFIG_H
#include <config.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif
-
+#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-58,6
+58,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/timing.h>
#endif
#include <yaz/timing.h>
#endif
+#include "ppmutex.h"
#include "session.h"
#include "parameters.h"
#include "client.h"
#include "session.h"
#include "parameters.h"
#include "client.h"
@@
-107,17
+108,6
@@
static const char *client_states[] = {
"Client_Disconnected"
};
"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];
const char *client_get_state_str(struct client *cl)
{
return client_states[cl->state];
@@
-360,6
+350,11
@@
static int nativesyntax_to_type(struct session_database *sdb, char *type,
{
strcpy(type, "xml");
}
{
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;
else
return -1;
return 0;
@@
-374,6
+369,11
@@
static int nativesyntax_to_type(struct session_database *sdb, char *type,
strcpy(type, "xml");
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");
else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21"))
{
strcpy(type, "xml; charset=marc8-s");
@@
-404,7
+404,7
@@
static void ingest_raw_record(struct client *cl, ZOOM_record rec)
client_show_raw_dequeue(cl);
}
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;
{
struct connection *co = cl->connection;
struct session *se = cl->session;
@@
-428,12
+428,16
@@
static void search_response(struct client *cl)
}
}
}
}
-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);
{
struct connection *co = cl->connection;
ZOOM_connection link = connection_get_link(co);
@@
-474,15
+478,18
@@
static void record_response(struct client *cl)
if (cl->session == 0)
;
else 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)",
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);
cl->record_offset);
+ }
else
{
struct session_database *sdb = client_get_database(cl);
NMEM nmem = nmem_create();
const char *xmlrec;
char type[80];
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");
xmlrec = ZOOM_record_get(rec, type, NULL);
if (nativesyntax_to_type(sdb, type, rec))
yaz_log(YLOG_WARN, "Failed to determine record type");
xmlrec = ZOOM_record_get(rec, type, NULL);
@@
-494,11
+501,6
@@
static void record_response(struct client *cl)
if (ingest_record(cl, xmlrec, cl->record_offset, nmem))
yaz_log(YLOG_WARN, "Failed to ingest from %s",
client_get_url(cl));
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);
}
}
nmem_destroy(nmem);
}
@@
-512,11
+514,6
@@
static void record_response(struct client *cl)
}
}
}
}
-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_start_search(struct client *cl)
{
struct session_database *sdb = client_get_database(cl);
@@
-610,7
+607,8
@@
struct client *client_create(void)
r->resultset = 0;
r->next = 0;
r->mutex = 0;
r->resultset = 0;
r->next = 0;
r->mutex = 0;
- yaz_mutex_create(&r->mutex);
+ pazpar2_mutex_create(&r->mutex, "client");
+
r->ref_count = 1;
return r;
r->ref_count = 1;
return r;
@@
-619,14
+617,14
@@
struct client *client_create(void)
void client_incref(struct client *c)
{
pazpar2_incref(&c->ref_count, c->mutex);
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)
{
}
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))
{
client_get_url(c), c->ref_count);
if (!pazpar2_decref(&c->ref_count, c->mutex))
{
@@
-635,13
+633,9
@@
int client_destroy(struct client *c)
c->pquery = 0;
xfree(c->cqlquery);
c->cqlquery = 0;
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);
+ assert(!c->connection);
+ assert(!c->resultset);
+
yaz_mutex_destroy(&c->mutex);
xfree(c);
return 1;
yaz_mutex_destroy(&c->mutex);
xfree(c);
return 1;
@@
-652,6
+646,11
@@
int client_destroy(struct client *c)
void client_set_connection(struct client *cl, struct connection *con)
{
void client_set_connection(struct client *cl, struct connection *con)
{
+ if (cl->resultset)
+ {
+ ZOOM_resultset_destroy(cl->resultset);
+ cl->resultset = 0;
+ }
if (con)
{
assert(cl->connection == 0);
if (con)
{
assert(cl->connection == 0);
@@
-813,8
+812,10
@@
int client_parse_query(struct client *cl, const char *query)
void client_remove_from_session(struct client *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(se);
if (se)
{
@@
-825,9
+826,11
@@
void client_remove_from_session(struct client *c)
assert(*ccp == c);
*ccp = c->next;
assert(*ccp == c);
*ccp = c->next;
+ c->database = 0;
c->session = 0;
c->next = 0;
}
c->session = 0;
c->next = 0;
}
+ client_destroy(c);
}
void client_set_session(struct client *cl, struct session *se)
}
void client_set_session(struct client *cl, struct session *se)
@@
-885,7
+888,10
@@
struct host *client_get_host(struct client *cl)
const char *client_get_url(struct client *cl)
{
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)
}
void client_set_maxrecs(struct client *cl, int v)