From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 9 Oct 2009 14:41:45 +0000 (+0200)
Subject: Merge branch 'reclist_max_recs'
X-Git-Tag: v1.2.2~14
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=c0e557c803dfdd8186a6aebd900f93a487f3e8ea;hp=-c;p=pazpar2-moved-to-github.git

Merge branch 'reclist_max_recs'
---

c0e557c803dfdd8186a6aebd900f93a487f3e8ea
diff --combined src/client.c
index 117a557,08cc491..b34cb60
--- a/src/client.c
+++ b/src/client.c
@@@ -520,11 -520,8 +520,8 @@@ void client_start_search(struct client 
      if (*opt_maxrecs)
          ZOOM_connection_option_set(link, "count", opt_maxrecs);
      else
-     {
-         char n[128];
-         sprintf(n, "%d", global_parameters.toget);
-         ZOOM_connection_option_set(link, "count", n);
-     }
+         ZOOM_connection_option_set(link, "count", "100");
+ 
      if (databaseName)
          ZOOM_connection_option_set(link, "databaseName", databaseName);
  
@@@ -657,10 -654,9 +654,10 @@@ static char *make_cqlquery(struct clien
      ODR odr_out = odr_createmem(ODR_ENCODE);
  
      zquery = p_query_rpn(odr_out, cl->pquery);
 +    yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
      if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery)))
      {
 -        yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status);
 +        yaz_log(YLOG_WARN, "Failed to generate CQL query, code=%d", status);
          r = 0;
      }
      else
@@@ -692,9 -688,8 +689,9 @@@ int client_parse_query(struct client *c
      if (!cn)
      {
          client_set_state(cl, Client_Error);
 -        yaz_log(YLOG_WARN, "Failed to parse query for %s",
 -                         client_get_database(cl)->database->url);
 +        yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s",
 +                query,
 +                client_get_database(cl)->database->url);
          return -1;
      }
      wrbuf_rewind(se->wrbuf);
@@@ -723,8 -718,7 +720,7 @@@
          extract_terms(se->nmem, cn, p);
          se->relevance = relevance_create(
              se->service->relevance_pct,
-             se->nmem, (const char **) p,
-             se->expected_maxrecs);
+             se->nmem, (const char **) p);
      }
  
      ccl_rpn_delete(cn);