X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftermlists.c;h=54e5f67924112ac2f3fab5766e3ad03f374b78de;hb=6424430743ec2d233dfc8118313cfa4299432e2c;hp=c0a7c132df13c7c2f03f68b817ab7e5361a34456;hpb=6ff7cb53029747ad6ac60fde903630ea063b5218;p=pazpar2-moved-to-github.git

diff --git a/src/termlists.c b/src/termlists.c
index c0a7c13..54e5f67 100644
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -107,23 +107,20 @@ static void update_highscore(struct termlist *tl, struct termlist_score *t)
     }
 }
 
-void termlist_insert(struct termlist *tl, const char *term, int freq)
+void termlist_insert(struct termlist *tl, const char *display_term,
+                     const char *norm_term, int freq)
 {
     unsigned int bucket;
     struct termlist_bucket **p;
-    char buf[256], *cp;
+    char buf[256];
 
-    if (strlen(term) > 255)
+    if (strlen(norm_term) > 255)
         return;
-    strcpy(buf, term);
-    /* chop right */
-    for (cp = buf + strlen(buf); cp != buf && strchr(",. -", cp[-1]); cp--)
-        cp[-1] = '\0';
-    
+    strcpy(buf, norm_term);
     bucket = jenkins_hash((unsigned char *)buf) % tl->hash_size;
     for (p = &tl->hashtable[bucket]; *p; p = &(*p)->next)
     {
-        if (!strcmp(buf, (*p)->term.term))
+        if (!strcmp(buf, (*p)->term.norm_term))
         {
             (*p)->term.frequency += freq;
             update_highscore(tl, &((*p)->term));
@@ -134,7 +131,9 @@ void termlist_insert(struct termlist *tl, const char *term, int freq)
     {
         struct termlist_bucket *new = nmem_malloc(tl->nmem,
                 sizeof(struct termlist_bucket));
-        new->term.term = nmem_strdup(tl->nmem, buf);
+        new->term.norm_term = nmem_strdup(tl->nmem, buf);
+        new->term.display_term = *display_term ?
+            nmem_strdup(tl->nmem, display_term) : new->term.norm_term;
         new->term.frequency = freq;
         new->next = 0;
         *p = new;
@@ -144,8 +143,12 @@ void termlist_insert(struct termlist *tl, const char *term, int freq)
 
 static int compare(const void *s1, const void *s2)
 {
-    struct termlist_score **p1 = (struct termlist_score**) s1, **p2 = (struct termlist_score **) s2;
-    return (*p2)->frequency - (*p1)->frequency;
+    struct termlist_score **p1 = (struct termlist_score **) s1;
+    struct termlist_score **p2 = (struct termlist_score **) s2;
+    int d = (*p2)->frequency - (*p1)->frequency;
+    if (d)
+        return d;
+    return strcmp((*p1)->display_term, (*p2)->display_term);
 }
 
 struct termlist_score **termlist_highscore(struct termlist *tl, int *len)