Added include of sys/time.h

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

diff --git a/src/reclists.c b/src/reclists.c
index bbf3510..3d4c7fc 100644 (file)
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,4 +1,4 @@
-/* $Id: reclists.c,v 1.15 2007-04-25 13:09:17 marc Exp $
+/* $Id: reclists.c,v 1.18 2007-07-02 20:55:50 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -41,6 +41,7 @@ struct reclist_bucket
     struct reclist_bucket *next;
 };
 
+#if 0
 struct reclist_sortparms * 
 reclist_sortparms_insert_field_id(NMEM nmem,
                          struct reclist_sortparms **sortparms,
@@ -67,8 +68,9 @@ reclist_sortparms_insert_field_id(NMEM nmem,
 
     return *sortparms;
 };
+#endif
 
-
+#if 0
 struct reclist_sortparms * 
 reclist_sortparms_insert(NMEM nmem, 
                          struct reclist_sortparms **sortparms,
@@ -90,7 +92,7 @@ reclist_sortparms_insert(NMEM nmem,
                                              service->sortkeys[field_id].type,
                                              increasing);
 };
-
+#endif
 
 
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
@@ -173,12 +175,15 @@ static int reclist_cmp(const void *p1, const void *p2)
         int res;
         switch (s->type)
         {
+            char *s1, *s2;
+            
             case Metadata_sortkey_relevance:
                 res = r2->relevance - r1->relevance;
                 break;
             case Metadata_sortkey_string:
-                res = strcmp(r2->sortkeys[s->offset]->text, 
-                             r1->sortkeys[s->offset]->text);
+                s1 = r1->sortkeys[s->offset] ? r1->sortkeys[s->offset]->text : "";
+                s2 = r2->sortkeys[s->offset] ? r2->sortkeys[s->offset]->text : "";
+                res = strcmp(s2, s1);
                 break;
             case Metadata_sortkey_numeric:
                 res = 0;
@@ -207,7 +212,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;
@@ -215,7 +220,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)