X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.h;h=66df1af26cab12a8da488275095ca7ec47df6c40;hb=f5a409a2a277b2579b7bc270f688b505f4d5564c;hp=57a47896eab5a96a31d5077887ac8821ba6856d5;hpb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;p=pazpar2-moved-to-github.git diff --git a/src/record.h b/src/record.h index 57a4789..66df1af 100644 --- a/src/record.h +++ b/src/record.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2012 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 @@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define RECORD_H -struct record; struct client; struct conf_service; @@ -58,13 +57,15 @@ union data_types * data_types_assign(NMEM nmem, struct record { struct client *client; // Array mirrors list of metadata fields in config - struct record_metadata **metadata; + struct record_metadata **metadata; // Array mirrors list of sortkey fields in config union data_types **sortkeys; // Next in cluster of merged records struct record *next; // client result set position; int position; + // checksum + unsigned checksum; }; @@ -73,38 +74,7 @@ struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys, struct record_metadata * record_metadata_create(NMEM nmem); -struct record_metadata * record_metadata_insert(NMEM nmem, - struct record_metadata ** rmd, - union data_types data); - - -struct record_metadata * record_add_metadata_field_id(NMEM nmem, - struct record * record, - int field_id, - union data_types data); - - -struct record_metadata * record_add_metadata(NMEM nmem, - struct record * record, - struct conf_service * service, - const char * name, - union data_types data); - - -union data_types * record_assign_sortkey_field_id(NMEM nmem, - struct record * record, - int field_id, - union data_types data); - - -union data_types * record_assign_sortkey(NMEM nmem, - struct record * record, - struct conf_service * service, - const char * name, - union data_types data); - - - +int record_compare(struct record *r1, struct record *r2, struct conf_service *service); struct record_cluster { @@ -112,7 +82,7 @@ struct record_cluster struct record_metadata **metadata; union data_types **sortkeys; char *merge_key; - int relevance; + int relevance_score; int *term_frequency_vec; int *term_frequency_vec_tmp; float *term_frequency_vecf; @@ -121,9 +91,6 @@ struct record_cluster struct record *records; }; - - - #endif // RECORD_H /*