X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.h;h=0f1f2496cdb29b4b9d95bfc884e7d4f09e7f78ef;hb=85b1f355522cc620452552d76fd517f089c98ab2;hp=66df1af26cab12a8da488275095ca7ec47df6c40;hpb=b026a4535c9ce5e0d371f23f19f9a337963bc908;p=pazpar2-moved-to-github.git

diff --git a/src/record.h b/src/record.h
index 66df1af..0f1f249 100644
--- a/src/record.h
+++ b/src/record.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 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
@@ -27,12 +27,15 @@ struct conf_service;
 union data_types {
     struct {
         const char *disp;
+        const char *norm;
         const char *sort;
+        const char *snippet;
     } text;
     struct {
         int min;
         int max;
     } number;
+    double fnumber;
 };
 
 
@@ -45,12 +48,12 @@ struct record_metadata_attr {
 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;
 };
 
-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);
 
 
@@ -60,10 +63,12 @@ struct record {
     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;
+    // score for ranking, either native or our TF/IDF, or other
+    double score;
     // checksum
     unsigned checksum;
 };
@@ -79,16 +84,21 @@ 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_metadata **metadata; 
+    struct record_metadata **metadata;
     union data_types **sortkeys;
-    char *merge_key;
+    // char *merge_key;
+    struct record_metadata_attr *merge_keys;
+
     int relevance_score;
     int *term_frequency_vec;
-    int *term_frequency_vec_tmp;
     float *term_frequency_vecf;
     // Set-specific ID for this record
     char *recid;
+    WRBUF relevance_explain1;
+    WRBUF relevance_explain2;
     struct record *records;
+    struct record_cluster *sorted_next;
+    struct reclist_sortparms *sort_parms;
 };
 
 #endif // RECORD_H