X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=afb4e3c160fc8fe624e45474339c741ebdd3900f;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=058715306b60fbd26987b31597cbf752c3118018;hpb=29c72c2f32f8114403a2a3abea5da58fed6f66ea;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 0587153..afb4e3c 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,7 +1,5 @@
-/* $Id: reclists.c,v 1.17 2007-05-11 06:48:32 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2009 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
@@ -14,15 +12,15 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <assert.h>
 
 #if HAVE_CONFIG_H
-#include <cconfig.h>
+#include <config.h>
 #endif
 
 #include <yaz/yaz-util.h>
@@ -110,7 +108,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
         const char *cpp;
         int increasing;
         int i;
-        int offset;
+        int offset = 0;
         enum conf_sortkey_type type;
         struct reclist_sortparms *new;
 
@@ -129,7 +127,6 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
         if (!strcmp(parm, "relevance"))
         {
             type = Metadata_sortkey_relevance;
-            offset = -1;
         }
         else
         {
@@ -169,37 +166,50 @@ static int reclist_cmp(const void *p1, const void *p2)
     struct record_cluster *r1 = (*(struct record_cluster**) p1);
     struct record_cluster *r2 = (*(struct record_cluster**) p2);
     struct reclist_sortparms *s;
+    int res = 0;
 
-    for (s = sortparms; s; s = s->next)
+    for (s = sortparms; s && res == 0; s = s->next)
     {
-        int res;
+        union data_types *ut1 = r1->sortkeys[s->offset];
+        union data_types *ut2 = r2->sortkeys[s->offset];
         switch (s->type)
         {
-            char *s1, *s2;
+            const char *s1, *s2;
             
             case Metadata_sortkey_relevance:
                 res = r2->relevance - r1->relevance;
                 break;
             case Metadata_sortkey_string:
-                s1 = r1->sortkeys[s->offset] ? r1->sortkeys[s->offset]->text : "";
-                s2 = r2->sortkeys[s->offset] ? r2->sortkeys[s->offset]->text : "";
+                s1 = ut1 ? ut1->text.sort : "";
+                s2 = ut2 ? ut2->text.sort : "";
                 res = strcmp(s2, s1);
+                if (res)
+                {
+                    if (s->increasing)
+                        res *= -1;
+                }
                 break;
             case Metadata_sortkey_numeric:
-                res = 0;
+                if (ut1 && ut2)
+                {
+                    if (s->increasing)
+                        res = ut1->number.min  - ut2->number.min;
+                    else
+                        res = ut2->number.max  - ut1->number.max;
+                }
+                else if (ut1 && !ut2)
+                    res = -1;
+                else if (!ut1 && ut2)
+                    res = 1;
+                else
+                    res = 0;
                 break;
             default:
-                yaz_log(YLOG_FATAL, "Bad sort type: %d", s->type);
-                exit(1);
-        }
-        if (res)
-        {
-            if (s->increasing)
-                res *= -1;
-            return res;
+                yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
+                res = 0;
         }
     }
-    return 0;
+    return res;
 }
 
 void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
@@ -212,7 +222,7 @@ void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
 
 struct record_cluster *reclist_read_record(struct reclist *l)
 {
-    if (l->pointer < l->num_records)
+    if (l && l->pointer < l->num_records)
         return l->flatlist[l->pointer++];
     else
         return 0;
@@ -220,7 +230,8 @@ struct record_cluster *reclist_read_record(struct reclist *l)
 
 void reclist_rewind(struct reclist *l)
 {
-    l->pointer = 0;
+    if (l)
+        l->pointer = 0;
 }
 
 // Jenkins one-at-a-time hash (from wikipedia)
@@ -267,7 +278,7 @@ struct reclist *reclist_create(NMEM nmem, int numrecs)
 struct record_cluster *reclist_insert( struct reclist *l,
                                        struct conf_service *service, 
                                        struct record  *record,
-                                       const char *merge_key, int *total)
+                                       char *merge_key, int *total)
 {
     unsigned int bucket;
     struct reclist_bucket **p;
@@ -304,10 +315,11 @@ struct record_cluster *reclist_insert( struct reclist *l,
         new->record = newc;
         new->next = 0;
         newc->records = record;
-        newc->merge_key = (char *) merge_key;
+        newc->merge_key = merge_key;
         newc->relevance = 0;
         newc->term_frequency_vec = 0;
-        newc->recid = (*total)++;
+        newc->recid = merge_key;
+        (*total)++;
         newc->metadata = nmem_malloc(l->nmem,
                 sizeof(struct record_metadata*) * service->num_metadata);
         memset(newc->metadata, 0, 
@@ -328,7 +340,9 @@ struct record_cluster *reclist_insert( struct reclist *l,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+