-/* $Id: pazpar2.c,v 1.1 2006-12-20 20:47:16 quinn Exp $ */;
+/* $Id: pazpar2.c,v 1.3 2006-12-20 23:28:37 adam Exp $ */;
#include <stdlib.h>
#include <stdio.h>
zquery->u.type_1 = ccl_rpn_query(global_parameters.odr_out, cn);
ccl_rpn_delete(cn);
- for (ndb = 0; *db->databases[ndb]; ndb++)
+ for (ndb = 0; db->databases[ndb]; ndb++)
;
databaselist = odr_malloc(global_parameters.odr_out, sizeof(char*) * ndb);
- for (ndb = 0; *db->databases[ndb]; ndb++)
+ for (ndb = 0; db->databases[ndb]; ndb++)
databaselist[ndb] = db->databases[ndb];
a->u.presentRequest->preferredRecordSyntax =
if ((res = getaddrinfo(url, port, &hints, &addrinfo)))
{
yaz_log(YLOG_WARN, "Failed to resolve %s: %s", url, gai_strerror(res));
+ xfree(host->hostport);
+ xfree(host);
continue;
}
assert(addrinfo->ai_family == PF_INET);
strcpy(database->url, url);
strcat(database->url, "/");
strcat(database->url, db);
- strcpy(database->databases[0], db);
- *database->databases[1] = '\0';
+
+ database->databases = xmalloc(2 * sizeof(char *));
+ database->databases[0] = xstrdup(db);
+ database->databases[1] = 0;
database->errors = 0;
database->next = databases;
databases = database;
return termlist_highscore(s->termlist, num);
}
-struct record **show(struct session *s, int start, int *num, int *total, int *sumhits)
+void report_nmem_stats(void)
{
- struct record **recs = nmem_malloc(s->nmem, *num * sizeof(struct record *));
+ size_t in_use, is_free;
+
+ nmem_get_memory_in_use(&in_use);
+ nmem_get_memory_free(&is_free);
+
+ yaz_log(YLOG_LOG, "nmem stat: use=%ld free=%ld",
+ (long) in_use, (long) is_free);
+}
+
+struct record **show(struct session *s, int start, int *num, int *total,
+ int *sumhits, NMEM nmem_show)
+{
+ struct record **recs = nmem_malloc(nmem_show, *num
+ * sizeof(struct record *));
int i;
relevance_prepare_read(s->relevance, s->reclist);