Refactor PP2 charsets handling, use pazpar2_mutex.

[pazpar2-moved-to-github.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index b4d323e..89197f1 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/timing.h>
 #endif
 
+#include "ppmutex.h"
 #include "session.h"
 #include "parameters.h"
 #include "client.h"
@@ -417,6 +418,15 @@ void client_search_response(struct client *cl)
     }
 }
 
+void client_got_records(struct client *cl)
+{
+    if (cl->session)
+    {
+        session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+        session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+    }
+}
+
 void client_record_response(struct client *cl)
 {
     struct connection *co = cl->connection;
@@ -467,6 +477,7 @@ void client_record_response(struct client *cl)
                     NMEM nmem = nmem_create();
                     const char *xmlrec;
                     char type[80];
+                    yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session);
                     if (nativesyntax_to_type(sdb, type, rec))
                         yaz_log(YLOG_WARN, "Failed to determine record type");
                     xmlrec = ZOOM_record_get(rec, type, NULL);
@@ -478,13 +489,9 @@ void client_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));
-                        else
-                        {
-                            session_alert_watch(cl->session, SESSION_WATCH_SHOW);
-                            session_alert_watch(cl->session, SESSION_WATCH_RECORD);
-                        }
                     }
                     nmem_destroy(nmem);
+                    yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p", cl, cl->session);
                 }
             }
             else
@@ -589,7 +596,8 @@ struct client *client_create(void)
     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;
@@ -598,14 +606,14 @@ struct client *client_create(void)
 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))
         {
@@ -801,6 +809,7 @@ void client_remove_from_session(struct client *c)
         assert(*ccp == c);
         *ccp = c->next;
         
+        c->database = 0;
         c->session = 0;
         c->next = 0;
     }
@@ -862,7 +871,10 @@ struct host *client_get_host(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)