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
d337ffe
..
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"
@@
-349,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;
@@
-363,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");
@@
-467,15
+478,18
@@
void client_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);
@@
-593,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;
@@
-618,8
+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;
-
- 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;
@@
-630,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);
@@
-805,6
+826,7
@@
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;
}
@@
-866,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)