X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.c;h=5fb908d4cbe6772f14baaef49c11b30edf208bb2;hb=05f913e34ce31985c00280308c340348ea289f2e;hp=2ad01d241500bf38be8654ca9bac0949eacfe766;hpb=096819eed21ab001d0c96dc6653f183ca0bd47a7;p=pazpar2-moved-to-github.git

diff --git a/src/record.c b/src/record.c
index 2ad01d2..5fb908d 100644
--- a/src/record.c
+++ b/src/record.c
@@ -1,7 +1,5 @@
-/* $Id: record.c,v 1.6 2007-04-24 22:19:19 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,13 +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.
- */
-
-/* $Id: record.c,v 1.6 2007-04-24 22:19:19 marc Exp $ */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 #include <string.h>
 
@@ -28,15 +23,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/nmem.h>
 
 #if HAVE_CONFIG_H
-#include <cconfig.h>
+#include <config.h>
 #endif
 
-//#define CONFIG_NOEXTERNS
-#include "config.h"
+#include "pazpar2_config.h"
 #include "record.h"
 
-
-
 union data_types * data_types_assign(NMEM nmem, 
                                      union data_types ** data1, 
                                      union data_types data2)
@@ -58,7 +50,8 @@ union data_types * data_types_assign(NMEM nmem,
 }
 
 
-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 * record = 0;
     int i = 0;
@@ -68,8 +61,7 @@ struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
     record = nmem_malloc(nmem, sizeof(struct record));
 
     record->next = 0;
-    // which client should I use for record->client = cl;  ??
-    record->client = 0;
+    record->client = client;
 
     record->metadata 
         = nmem_malloc(nmem, 
@@ -82,10 +74,21 @@ struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
                       sizeof(union data_types*) * num_sortkeys);
     for (i = 0; i < num_sortkeys; i++)
         record->sortkeys[i] = 0;
+
+    record->position = position;
     
     return record;
 }
 
+struct record_metadata * record_metadata_create(NMEM nmem)
+{
+    struct record_metadata * rec_md 
+        = nmem_malloc(nmem, sizeof(struct record_metadata));
+    rec_md->next = 0;
+    rec_md->attributes = 0;
+    return rec_md;
+}
+
 
 struct record_metadata * record_metadata_insert(NMEM nmem, 
                                                 struct record_metadata ** rmd,
@@ -182,7 +185,9 @@ union data_types * record_assign_sortkey(NMEM nmem,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+