X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=7e1645a4ac41a7ed9db2d05d1f8595cbd8d2ded9;hb=eae6eee32de3560f84a83ee5cc922a2d3d63cc44;hp=5975b69061eb122f520e55330a32879ec5df40d6;hpb=ce83afcc8705467f318609f6a848b1d023d31a46;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 5975b69..7e1645a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -107,17 +107,6 @@ static const char *client_states[] = {
     "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];
@@ -404,7 +393,7 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec)
     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;
@@ -428,12 +417,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);
@@ -494,11 +487,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));
-                        else
-                        {
-                            session_alert_watch(cl->session, SESSION_WATCH_SHOW);
-                            session_alert_watch(cl->session, SESSION_WATCH_RECORD);
-                        }
                     }
                     nmem_destroy(nmem);
                 }
@@ -512,11 +500,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);
@@ -635,12 +618,7 @@ int client_destroy(struct client *c)
             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);
@@ -813,8 +791,10 @@ int client_parse_query(struct client *cl, const char *query)
 
 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)
     {
@@ -828,6 +808,7 @@ void client_remove_from_session(struct client *c)
         c->session = 0;
         c->next = 0;
     }
+    client_destroy(c);
 }
 
 void client_set_session(struct client *cl, struct session *se)