X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.h;h=ada04d26e1173c8196fcd4919311ef963bcdc6bf;hb=113f9b0156b53993e03e2c9692832e4ac6d40693;hp=a5afde1b62a56a9ca95e767ac54f1357589f35a7;hpb=ee40230fd0e997212b707fafcdec0da154fd1b21;p=pazpar2-moved-to-github.git

diff --git a/src/record.h b/src/record.h
index a5afde1..ada04d2 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) 2006-2013 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
@@ -28,11 +28,13 @@ union data_types {
     struct {
         const char *disp;
         const char *sort;
+        const char *snippet;
     } text;
     struct {
         int min;
         int max;
     } number;
+    double fnumber;
 };
 
 
@@ -81,16 +83,19 @@ struct record_cluster
     // Array mirrors list of metadata fields in config
     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