Can send additional parameters with the search command (connected to bug #2217)

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

diff --git a/src/record.h b/src/record.h
index 9a34467..ae2a7b7 100644 (file)
--- a/src/record.h
+++ b/src/record.h
@@ -1,7 +1,5 @@
-/* $Id: record.h,v 1.3 2007-04-23 08:48:50 marc Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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,10 +12,10 @@ 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
@@ -28,19 +26,29 @@ 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;
     // 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;
     // Array mirrors list of metadata fields in config
@@ -49,10 +57,15 @@ struct record {
     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,
@@ -72,6 +85,21 @@ struct record_metadata * record_add_metadata(NMEM nmem,
                                              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
 {
     // Array mirrors list of metadata fields in config
@@ -81,11 +109,13 @@ struct record_cluster
     int relevance;
     int *term_frequency_vec;
     // Set-specific ID for this record
-    int recid; 
+    char *recid;
     struct record *records;
 };
 
 
+
+
 #endif // RECORD_H
 
 /*