projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add logic to detect sort order changes and trigger new searching if required. Using...
[pazpar2-moved-to-github.git]
/
src
/
record.h
diff --git
a/src/record.h
b/src/record.h
index
66df1af
..
fb6f8e1
100644
(file)
--- a/
src/record.h
+++ b/
src/record.h
@@
-45,12
+45,12
@@
struct record_metadata_attr {
struct record_metadata {
union data_types data;
// next item of this name
struct record_metadata {
union data_types data;
// next item of this name
- struct record_metadata *next;
+ struct record_metadata *next;
struct record_metadata_attr *attributes;
};
struct record_metadata_attr *attributes;
};
-union data_types * data_types_assign(NMEM nmem,
- union data_types ** data1,
+union data_types * data_types_assign(NMEM nmem,
+ union data_types ** data1,
union data_types data2);
union data_types data2);
@@
-60,8
+60,8
@@
struct record {
struct record_metadata **metadata;
// Array mirrors list of sortkey fields in config
union data_types **sortkeys;
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;
+ // Next in cluster of merged records
+ struct record *next;
// client result set position;
int position;
// checksum
// client result set position;
int position;
// checksum
@@
-79,15
+79,16
@@
int record_compare(struct record *r1, struct record *r2, struct conf_service *se
struct record_cluster
{
// Array mirrors list of metadata fields in config
struct record_cluster
{
// Array mirrors list of metadata fields in config
- struct record_metadata **metadata;
+ struct record_metadata **metadata;
union data_types **sortkeys;
char *merge_key;
int relevance_score;
int *term_frequency_vec;
union data_types **sortkeys;
char *merge_key;
int relevance_score;
int *term_frequency_vec;
- int *term_frequency_vec_tmp;
float *term_frequency_vecf;
// Set-specific ID for this record
char *recid;
float *term_frequency_vecf;
// Set-specific ID for this record
char *recid;
+ WRBUF relevance_explain1;
+ WRBUF relevance_explain2;
struct record *records;
};
struct record *records;
};