-/* $Id: reclists.c,v 1.20 2007-07-23 12:23:30 adam Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2008 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
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>
const char *cpp;
int increasing;
int i;
- int offset;
+ int offset = 0;
enum conf_sortkey_type type;
struct reclist_sortparms *new;
if (!strcmp(parm, "relevance"))
{
type = Metadata_sortkey_relevance;
- offset = -1;
}
else
{
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 = ut1 ? ut1->text : "";
- s2 = ut2 ? ut2->text : "";
+ s1 = ut1 ? ut1->text.sort : "";
+ s2 = ut2 ? ut2->text.sort : "";
res = strcmp(s2, s1);
if (res)
{
res = 0;
break;
default:
- yaz_log(YLOG_FATAL, "Bad sort type: %d", s->type);
- exit(1);
+ yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
+ res = 0;
}
}
return res;