X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frecord.h;h=2071621456d9b5de41229270740cbb98ee7c7e46;hb=9c5d5d176df284a6ec614456306e87cb3a8d2f12;hp=bbba218ce9aa8f3f965dc0d2a00d7f4d9b44e0d9;hpb=3670a21abc40afe784b2127c4d831471761747a0;p=pazpar2-moved-to-github.git

diff --git a/src/record.h b/src/record.h
index bbba218..2071621 100644
--- a/src/record.h
+++ b/src/record.h
@@ -1,4 +1,4 @@
-/* $Id: record.h,v 1.2 2007-04-20 14:37:17 marc Exp $
+/* $Id: record.h,v 1.12 2007-09-10 16:25:50 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -25,48 +25,99 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 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 {
     union data_types data;
-    struct record_metadata *next; // next item of this name
+    // next item of this name
+    struct record_metadata *next; 
 };
 
+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 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_metadata * record_add_metadata_fieldno(NMEM nmem, 
-                                                     struct record * record,
-                                                     int fieldno, 
-                                                     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 *term_frequency_vec;
-    int recid; // Set-specific ID for this record
+    // Set-specific ID for this record
+    char *recid;
     struct record *records;
 };
 
 
+
+
 #endif // RECORD_H
 
 /*