Fixed leak WRT ZOOM_query

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

diff --git a/src/client.c b/src/client.c
index 1f8de6d..d67712e 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -83,7 +83,7 @@ struct client {
     char *pquery; // Current search
     char *cqlquery; // used for SRU targets only
     int hits;
-    int records;
+    int record_offset;
     int setno;
     int requestid;            // ID of current outstanding request
     int diagnostic;
@@ -108,9 +108,7 @@ static const char *client_states[] = {
     "Client_Connecting",
     "Client_Connected",
     "Client_Idle",
-    "Client_Initializing",
-    "Client_Searching",
-    "Client_Presenting",
+    "Client_Working",
     "Client_Error",
     "Client_Failed",
     "Client_Disconnected",
@@ -146,7 +144,6 @@ static void client_show_raw_error(struct client *cl, const char *addinfo);
 // Close connection and set state to error
 void client_fatal(struct client *cl)
 {
-    //client_show_raw_error(cl, "client connection failure");
     yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
     connection_destroy(cl->connection);
     client_set_state(cl, Client_Error);
@@ -313,7 +310,6 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type)
         }
         else
             return -1;
-        yaz_log(YLOG_LOG, "Returned type %s", type);
         return 0;
     }
     return -1;
@@ -349,7 +345,7 @@ void client_search_response(struct client *cl)
     if (ZOOM_connection_error(link, &error, &addinfo))
     {
         cl->hits = 0;
-        cl->state = Client_Error;
+        client_set_state(cl, Client_Error);
         yaz_log(YLOG_WARN, "Search error %s (%s): %s",
             error, addinfo, client_get_url(cl));
     }
@@ -368,10 +364,9 @@ void client_record_response(struct client *cl)
     ZOOM_resultset resultset = connection_get_resultset(co);
     const char *error, *addinfo;
 
-    yaz_log(YLOG_LOG, "client_record_response");
     if (ZOOM_connection_error(link, &error, &addinfo))
     {
-        cl->state = Client_Error;
+        client_set_state(cl, Client_Error);
         yaz_log(YLOG_WARN, "Search error %s (%s): %s",
             error, addinfo, client_get_url(cl));
     }
@@ -380,8 +375,6 @@ void client_record_response(struct client *cl)
         ZOOM_record rec = 0;
         const char *msg, *addinfo;
         
-        yaz_log(YLOG_LOG, "show_raw=%p show_raw->active=%d",
-                cl->show_raw, cl->show_raw ? cl->show_raw->active : 0);
         if (cl->show_raw && cl->show_raw->active)
         {
             if ((rec = ZOOM_resultset_record(resultset,
@@ -390,18 +383,22 @@ void client_record_response(struct client *cl)
                 cl->show_raw->active = 0;
                 ingest_raw_record(cl, rec);
             }
+            else
+            {
+                yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
+                        cl->show_raw->position-1);
+            }
         }
         else
         {
-            int offset = cl->records;
+            int offset = cl->record_offset;
             if ((rec = ZOOM_resultset_record(resultset, offset)))
             {
-                yaz_log(YLOG_LOG, "Record with offset %d", offset);
-                
-                cl->records++;
+                cl->record_offset++;
                 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), cl->records);
+                            error, addinfo, client_get_url(cl),
+                            cl->record_offset);
                 else
                 {
                     struct session_database *sdb = client_get_database(cl);
@@ -410,7 +407,7 @@ void client_record_response(struct client *cl)
                     nativesyntax_to_type(sdb, type);
                     if ((xmlrec = ZOOM_record_get(rec, type, NULL)))
                     {
-                        if (ingest_record(cl, xmlrec, cl->records))
+                        if (ingest_record(cl, xmlrec, cl->record_offset))
                         {
                             session_alert_watch(cl->session, SESSION_WATCH_SHOW);
                             session_alert_watch(cl->session, SESSION_WATCH_RECORD);
@@ -423,9 +420,12 @@ void client_record_response(struct client *cl)
                 }
 
             }
+            else
+            {
+                yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
+                        offset);
+            }
         }
-        if (!rec)
-            yaz_log(YLOG_WARN, "Expected record, but got NULL");
     }
 }
 
@@ -446,8 +446,9 @@ void client_start_search(struct client *cl)
     assert(link);
 
     cl->hits = -1;
-    cl->records = 0;
+    cl->record_offset = 0;
     cl->diagnostic = 0;
+    client_set_state(cl, Client_Working);
 
     if (*opt_piggyback)
         ZOOM_connection_option_set(link, "piggyback", opt_piggyback);
@@ -469,9 +470,8 @@ void client_start_search(struct client *cl)
         sprintf(n, "%d", global_parameters.toget);
         ZOOM_connection_option_set(link, "count", n);
     }
-    if (!databaseName || !*databaseName)
-        databaseName = "Default";
-    ZOOM_connection_option_set(link, "databaseName", databaseName);
+    if (databaseName)
+        ZOOM_connection_option_set(link, "databaseName", databaseName);
 
     ZOOM_connection_option_set(link, "presentChunk", "20");
 
@@ -480,6 +480,7 @@ void client_start_search(struct client *cl)
         ZOOM_query q = ZOOM_query_create();
         ZOOM_query_cql(q, cl->cqlquery);
         rs = ZOOM_connection_search(link, q);
+        ZOOM_query_destroy(q);
     }
     else
         rs = ZOOM_connection_search_pqf(link, cl->pquery);
@@ -503,7 +504,7 @@ struct client *client_create(void)
     r->connection = 0;
     r->session = 0;
     r->hits = 0;
-    r->records = 0;
+    r->record_offset = 0;
     r->setno = 0;
     r->requestid = -1;
     r->diagnostic = 0;
@@ -596,7 +597,7 @@ static char *make_cqlquery(struct client *cl)
         yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status);
         return 0;
     }
-    r = xstrdup(wrbuf_buf(wrb));
+    r = xstrdup(wrbuf_cstr(wrb));
 
     wrbuf_destroy(wrb);
     odr_reset(global_parameters.odr_out); // releases the zquery
@@ -621,7 +622,7 @@ int client_parse_query(struct client *cl, const char *query)
     ccl_qual_rm(&ccl_map);
     if (!cn)
     {
-        cl->state = Client_Error;
+        client_set_state(cl, Client_Error);
         yaz_log(YLOG_WARN, "Failed to parse query for %s",
                          client_get_database(cl)->database->url);
         return -1;
@@ -686,7 +687,7 @@ int client_get_hits(struct client *cl)
 
 int client_get_num_records(struct client *cl)
 {
-    return cl->records;
+    return cl->record_offset;
 }
 
 int client_get_diagnostic(struct client *cl)