X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=d3e09ba43fa7c6e9a7f98c68096c7b9bd157d351;hb=f9fd1939f30660831f6390a91839357133e005ea;hp=01267cdd9a4b961391cc4d3612541ecd3df489aa;hpb=b73890ede1ee6eeb8a07937733871077df6f15b9;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 01267cd..d3e09ba 100644 --- 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 #endif - +#include #include #include #include @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include "ppmutex.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"); } + 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; @@ -363,6 +369,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, 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"); @@ -428,6 +439,8 @@ void client_got_records(struct client *cl) void client_record_response(struct client *cl) { + static pthread_mutex_t ingest_mutex = PTHREAD_MUTEX_INITIALIZER; + static int ingest_counter = 0, ingest_max = 0; struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; @@ -467,16 +480,29 @@ void client_record_response(struct client *cl) if (cl->session == 0) ; else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + { 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); + } else { struct session_database *sdb = client_get_database(cl); NMEM nmem = nmem_create(); const char *xmlrec; + int new_max = 0; char type[80]; yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session); + pthread_mutex_lock(&ingest_mutex); + ++ingest_counter; + if (ingest_counter > ingest_max) + { + ingest_max = ingest_counter; + new_max = ingest_max; + } + pthread_mutex_unlock(&ingest_mutex); + if (new_max) + yaz_log(YLOG_LOG, "New max client=%p new_max=%d", cl, new_max); if (nativesyntax_to_type(sdb, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); xmlrec = ZOOM_record_get(rec, type, NULL); @@ -489,8 +515,11 @@ void client_record_response(struct client *cl) yaz_log(YLOG_WARN, "Failed to ingest from %s", client_get_url(cl)); } + pthread_mutex_lock(&ingest_mutex); + --ingest_counter; + pthread_mutex_unlock(&ingest_mutex); nmem_destroy(nmem); - yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p", cl, cl->session); + yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p max=%d", cl, cl->session, ingest_max); } } else @@ -595,8 +624,7 @@ struct client *client_create(void) r->resultset = 0; r->next = 0; r->mutex = 0; - yaz_mutex_create(&r->mutex); - yaz_mutex_set_name(r->mutex, "client"); + pazpar2_mutex_create(&r->mutex, "client"); r->ref_count = 1;