Basic full record display logic.

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 3805d88..1f23d6c 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.30 2007-01-15 04:34:28 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.35 2007-01-16 03:38:49 quinn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -319,7 +319,10 @@ char *normalize_mergekey(char *buf, int skiparticle)
             p++;
     }
     if (buf != pout)
-        *pout = '\0';
+        do {
+            *(pout--) = '\0';
+        }
+        while (pout > buf && *pout == ' ');
 
     return buf;
 }
@@ -364,6 +367,8 @@ static void add_facet(struct session *s, const char *type, const char *value)
 {
     int i;
 
+    if (!*value)
+        return;
     for (i = 0; i < s->num_termlists; i++)
         if (!strcmp(s->termlists[i].name, type))
             break;
@@ -567,7 +572,12 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
             newm->next = 0;
             if (md->type == Metadata_type_generic)
             {
+                char *p;
                 newm->data.text = nmem_strdup(se->nmem, value);
+                for (p = newm->data.text + strlen(newm->data.text) - 1;
+                        p > newm->data.text && strchr(" ,/.", *p); p--)
+                    *p = '\0';
+
             }
             else if (md->type == Metadata_type_year)
             {
@@ -588,7 +598,7 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
             {
                 struct record_metadata *mnode;
                 for (mnode = *wheretoput; mnode; mnode = mnode->next)
-                    if (!strcmp(mnode->data.text, mnode->data.text))
+                    if (!strcmp(mnode->data.text, newm->data.text))
                         break;
                 if (!mnode)
                 {
@@ -611,7 +621,6 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
                         normalize_mergekey(s,
                                 (sk->type == Metadata_sortkey_skiparticle));
                         cluster->sortkeys[md->sortkey_offset]->text = s;
-                        yaz_log(YLOG_LOG, "SK Longest: %s", s);
                     }
                 }
             }
@@ -644,11 +653,13 @@ static struct record *ingest_record(struct client *cl, Z_External *rec)
                         sdata->number.max = last;
                     }
                 }
+#ifdef GAGA
                 if (sk)
                 {
                     union data_types *sdata = cluster->sortkeys[md->sortkey_offset];
                     yaz_log(YLOG_LOG, "SK range: %d-%d", sdata->number.min, sdata->number.max);
                 }
+#endif
             }
             else
                 yaz_log(YLOG_WARN, "Don't know how to merge on element name %s", md->name);