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
finished test ICU stand-allone program for benchmarking of ICU tokenization and norma...
[pazpar2-moved-to-github.git]
/
src
/
reclists.c
diff --git
a/src/reclists.c
b/src/reclists.c
index
bbf3510
..
0587153
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.17 2007-05-11 06:48:32 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)
@@
-173,12
+175,15
@@
static int reclist_cmp(const void *p1, const void *p2)
int res;
switch (s->type)
{
int res;
switch (s->type)
{
+ char *s1, *s2;
+
case Metadata_sortkey_relevance:
res = r2->relevance - r1->relevance;
break;
case Metadata_sortkey_string:
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;
break;
case Metadata_sortkey_numeric:
res = 0;