projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f41e573
..
3d4c7fc
100644
(file)
--- a/
src/reclists.c
+++ b/
src/reclists.c
@@
-1,4
+1,4
@@
-/* $Id: reclists.c,v 1.16 2007-05-01 05:02:54 quinn 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.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-41,6
+41,7
@@
struct reclist_bucket
struct reclist_bucket *next;
};
struct reclist_bucket *next;
};
+#if 0
struct reclist_sortparms *
reclist_sortparms_insert_field_id(NMEM nmem,
struct reclist_sortparms **sortparms,
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;
};
return *sortparms;
};
+#endif
-
+#if 0
struct reclist_sortparms *
reclist_sortparms_insert(NMEM nmem,
struct reclist_sortparms **sortparms,
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);
};
service->sortkeys[field_id].type,
increasing);
};
-
+#endif
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
@@
-210,7
+212,7
@@
void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
struct record_cluster *reclist_read_record(struct reclist *l)
{
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;
return l->flatlist[l->pointer++];
else
return 0;
@@
-218,7
+220,8
@@
struct record_cluster *reclist_read_record(struct reclist *l)
void reclist_rewind(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)
}
// Jenkins one-at-a-time hash (from wikipedia)