X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.h;h=502935683b5966ce878ee4b97799c21bda3870ec;hb=refs%2Fheads%2Fbranch-1.4.4;hp=149428581846bcacdd6fadbfd8d2f40a511c0b73;hpb=4d4deab1ab8bfec73a481ae43127687d13826146;p=pazpar2-moved-to-github.git

diff --git a/src/record.h b/src/record.h
index 1494285..5029356 100644
--- a/src/record.h
+++ b/src/record.h
@@ -1,7 +1,5 @@
-/* $Id: record.h,v 1.1 2007-04-20 13:03:22 marc Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2010 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
@@ -14,57 +12,125 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef RECORD_H
 #define RECORD_H
 
 
-struct record;
 struct client;
-
+struct conf_service;
 
 union data_types {
-    char *text;
+    struct {
+        const char *disp;
+        const char *sort;
+    } text;
     struct {
         int min;
         int max;
     } number;
 };
 
+
+struct record_metadata_attr {
+    char *name;
+    char *value;
+    struct record_metadata_attr *next;
+};
+
 struct record_metadata {
     union data_types data;
-    struct record_metadata *next; // next item of this name
+    // next item of this name
+    struct record_metadata *next; 
+    struct record_metadata_attr *attributes;
 };
 
+union data_types * data_types_assign(NMEM nmem, 
+                                     union data_types ** data1, 
+                                     union data_types data2);
+
+
 struct record {
     struct client *client;
-    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
-    union data_types **sortkeys;       // Array mirrors list of sortkey fields in config
-    struct record *next;  // Next in cluster of merged records
+    // Array mirrors list of metadata fields in config
+    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;  
+    // client result set position;
+    int position;
 };
 
+
+struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys,
+                              struct client *client, int position);
+
+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);
+
+
+
+
 struct record_cluster
 {
-    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    // Array mirrors list of metadata fields in config
+    struct record_metadata **metadata; 
     union data_types **sortkeys;
     char *merge_key;
-    int relevance;
+    int relevance_score;
     int *term_frequency_vec;
-    int recid; // Set-specific ID for this record
+    int *term_frequency_vec_tmp;
+    float *term_frequency_vecf;
+    // Set-specific ID for this record
+    char *recid;
     struct record *records;
 };
 
 
+
+
 #endif // RECORD_H
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+