Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

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

diff --git a/src/record.h b/src/record.h
index 872c36e..b7efc2e 100644 (file)
--- a/src/record.h
+++ b/src/record.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2011 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,7 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define RECORD_H
 
 
-struct record;
 struct client;
 struct conf_service;
 
@@ -73,38 +72,7 @@ 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
 {
@@ -112,16 +80,15 @@ struct record_cluster
     struct record_metadata **metadata; 
     union data_types **sortkeys;
     char *merge_key;
-    int relevance;
+    int relevance_score;
     int *term_frequency_vec;
+    int *term_frequency_vec_tmp;
+    float *term_frequency_vecf;
     // Set-specific ID for this record
     char *recid;
     struct record *records;
 };
 
-
-
-
 #endif // RECORD_H
 
 /*