Fix connection_is_idle test for idleness

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

diff --git a/src/client.c b/src/client.c
index b4d323e..00e72d2 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -417,6 +417,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;
@@ -478,11 +487,6 @@ 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);
                 }
@@ -598,14 +602,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 +805,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 +867,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)