From: Marc Cromme Date: Wed, 25 Apr 2007 08:07:47 +0000 (+0000) Subject: function reclist_insert() does not change mergekey, so parameter signature changed... X-Git-Tag: PAZPAR2.1.0.0~213 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=c2705b2bc91f199440a2adad7c3274bcdcce6509;p=pazpar2-moved-to-github.git function reclist_insert() does not change mergekey, so parameter signature changed to const char *merge_key --- diff --git a/src/reclists.c b/src/reclists.c index ed5c0ec..35aaede 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,4 +1,4 @@ -/* $Id: reclists.c,v 1.12 2007-04-17 12:15:32 marc Exp $ +/* $Id: reclists.c,v 1.13 2007-04-25 08:07:47 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -207,7 +207,7 @@ struct reclist *reclist_create(NMEM nmem, int numrecs) struct record_cluster *reclist_insert( struct reclist *l, struct conf_service *service, struct record *record, - char *merge_key, int *total) + const char *merge_key, int *total) { unsigned int bucket; struct reclist_bucket **p; @@ -244,7 +244,7 @@ struct record_cluster *reclist_insert( struct reclist *l, new->record = newc; new->next = 0; newc->records = record; - newc->merge_key = merge_key; + newc->merge_key = (char *) merge_key; newc->relevance = 0; newc->term_frequency_vec = 0; newc->recid = (*total)++; diff --git a/src/reclists.h b/src/reclists.h index f61615b..8cc7d2b 100644 --- a/src/reclists.h +++ b/src/reclists.h @@ -1,4 +1,4 @@ -/* $Id: reclists.h,v 1.8 2007-04-20 13:03:22 marc Exp $ +/* $Id: reclists.h,v 1.9 2007-04-25 08:07:47 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -52,7 +52,7 @@ struct reclist *reclist_create(NMEM, int numrecs); struct record_cluster *reclist_insert( struct reclist *tl, struct conf_service *service, struct record *record, - char *merge_key, int *total); + const char *merge_key, int *total); void reclist_sort(struct reclist *l, struct reclist_sortparms *parms); struct record_cluster *reclist_read_record(struct reclist *l); void reclist_rewind(struct reclist *l);