X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.h;h=2b2075f0464853c6d1cbd2caf3d7c38e32a16306;hb=1b56599d640db9f36686a640f5990d0732b22298;hp=0c9dff9ead5181f2d85e0daf70f612f6e725d0ba;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git diff --git a/src/record.h b/src/record.h index 0c9dff9..2b2075f 100644 --- a/src/record.h +++ b/src/record.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 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; @@ -37,11 +36,17 @@ union data_types { }; +struct record_metadata_attr { + char *name; + char *value; + struct record_metadata_attr *next; +}; struct record_metadata { union data_types data; // next item of this name struct record_metadata *next; + struct record_metadata_attr *attributes; }; union data_types * data_types_assign(NMEM nmem, @@ -67,38 +72,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 { @@ -106,22 +80,23 @@ 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; // Set-specific ID for this record char *recid; struct record *records; }; - - - #endif // RECORD_H /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +