From e161d8d877ae9a61153f2ceb3956a48c3b0ef778 Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Tue, 16 Jan 2007 23:42:10 +0000
Subject: [PATCH] *** empty log message ***

---
 src/pazpar2.c   |    7 +++++--
 src/termlists.c |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pazpar2.c b/src/pazpar2.c
index ef6e054..2c05b8c 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.38 2007-01-16 19:42:20 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.39 2007-01-16 23:42:10 quinn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -517,6 +517,9 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
     normalize_mergekey(mergekey_norm, 0);
 
     cluster = reclist_insert(se->reclist, res, mergekey_norm, &se->total_merged);
+    if (global_parameters.dump_records)
+        yaz_log(YLOG_LOG, "Cluster id %d from %s (#%d)", cluster->recid,
+                cl->database->url, cl->records);
     if (!cluster)
     {
         /* no room for record */
@@ -702,6 +705,7 @@ static void ingest_records(struct client *cl, Z_Records *r)
     {
         Z_NamePlusRecord *npr = rlist->records[i];
 
+        cl->records++;
         if (npr->which != Z_NamePlusRecord_databaseRecord)
         {
             yaz_log(YLOG_WARN, "Unexpected record type, probably diagnostic");
@@ -743,7 +747,6 @@ static void do_presentResponse(IOCHAN i, Z_APDU *a)
     if (!*r->presentStatus && cl->state != Client_Error)
     {
         yaz_log(YLOG_DEBUG, "Good Present response");
-        cl->records += *r->numberOfRecordsReturned;
         ingest_records(cl, r->records);
         cl->state = Client_Idle;
     }
diff --git a/src/termlists.c b/src/termlists.c
index 19517d7..0435f2a 100644
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -1,5 +1,5 @@
 /*
- * $Id: termlists.c,v 1.5 2007-01-15 19:01:15 quinn Exp $
+ * $Id: termlists.c,v 1.6 2007-01-16 23:42:10 quinn Exp $
  */
 
 #include <stdlib.h>
@@ -131,7 +131,7 @@ void termlist_insert(struct termlist *tl, const char *term)
         return;
     strcpy(buf, term);
     for (cp = buf + strlen(buf) - 1; cp > buf &&
-            (*cp == ',' || *cp == '.' || *cp == ' '); cp--)
+            (*cp == ',' || *cp == '.' || *cp == ' ' || *cp == '-'); cp--)
         *cp = '\0';
 
     bucket = hash((unsigned char *)buf) & tl->hashmask;
-- 
1.7.10.4