Start work on multiple mergekeys - tests do not pass

[pazpar2-moved-to-github.git] / src / record.h

diff --git a/src/record.h b/src/record.h
index a5afde1..fc01b5c 100644 (file)
--- 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,6 +28,7 @@ union data_types {
     struct {
         const char *disp;
         const char *sort;
+        const char *snippet;
     } text;
     struct {
         int min;
@@ -81,10 +82,11 @@ 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;