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

diff --git a/src/record.h b/src/record.h
index 2a46c2b..0f1f249 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) 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,19 +21,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define RECORD_H
 
 
-struct record;
 struct client;
 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;
 };
 
 
@@ -46,25 +48,29 @@ 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);
 
 
 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;  
+    // 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;
 };
 
 
@@ -73,57 +79,28 @@ 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
 {
     // 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
 
 /*