-/* $Id: reclists.c,v 1.14 2007-04-25 09:23:03 marc 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>
struct reclist_bucket *next;
};
+#if 0
+struct reclist_sortparms *
+reclist_sortparms_insert_field_id(NMEM nmem,
+ struct reclist_sortparms **sortparms,
+ int field_id,
+ enum conf_sortkey_type type,
+ int increasing)
+{
+ struct reclist_sortparms * tmp_rlsp = 0;
+ // assert(nmem);
+
+ if(!sortparms || field_id < 0)
+ return 0;
+
+ // construct new reclist_sortparms
+ tmp_rlsp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
+ tmp_rlsp->offset = field_id;
+ tmp_rlsp->type = type;
+ tmp_rlsp->increasing = increasing;
+
+
+ // insert in *sortparms place, moving *sortparms one down the list
+ tmp_rlsp->next = *sortparms;
+ *sortparms = tmp_rlsp;
+
+ return *sortparms;
+};
+#endif
+
+#if 0
+struct reclist_sortparms *
+reclist_sortparms_insert(NMEM nmem,
+ struct reclist_sortparms **sortparms,
+ struct conf_service * service,
+ const char * name,
+ int increasing)
+{
+ int field_id = 0;
+
+ if (!sortparms || !service || !name)
+ return 0;
+
+ field_id = conf_service_sortkey_field_id(service, name);
+
+ if (-1 == field_id)
+ return 0;
+
+ return reclist_sortparms_insert_field_id(nmem, sortparms, field_id,
+ service->sortkeys[field_id].type,
+ increasing);
+};
+#endif
+
+
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
{
struct reclist_sortparms *res = 0;
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
{
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)
{
+ const 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 = 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)
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;
void reclist_rewind(struct reclist *l)
{
- l->pointer = 0;
+ if (l)
+ l->pointer = 0;
}
// Jenkins one-at-a-time hash (from wikipedia)
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;
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,
projects / pazpar2-moved-to-github.git / blobdiff