X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord.c;h=19b06d7395ac39f4a0275fa0370a850c85dd6522;hb=64dccf5757a22cedd3c21ca834e3e02f39dd0504;hp=277fd1b5c928342e4f0ec458ea9b60887a301bad;hpb=3670a21abc40afe784b2127c4d831471761747a0;p=pazpar2-moved-to-github.git

diff --git a/src/record.c b/src/record.c
index 277fd1b..19b06d7 100644
--- a/src/record.c
+++ b/src/record.c
@@ -1,7 +1,5 @@
-/* $Id: record.c,v 1.1 2007-04-20 14:37:17 marc Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 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.1 2007-04-20 14:37:17 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,70 +23,130 @@ 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 "client.h"
 #include "record.h"
 
+union data_types * data_types_assign(NMEM nmem,
+                                     union data_types ** data1,
+                                     union data_types data2)
+{
+    // assert(nmem);
+
+    if (!data1)
+        return 0;
 
-struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
+    if (!*data1){
+        if (!nmem)
+            return 0;
+        else
+            *data1  = nmem_malloc(nmem, sizeof(union data_types));
+    }
+
+    **data1 = data2;
+    return *data1;
+}
+
+
+struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys,
+                              struct client *client, int position)
 {
     struct record * record = 0;
-    
+    int i = 0;
+    const char *name = client_get_id(client);
+    unsigned h = position;
+
     // assert(nmem);
 
     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, 
+    record->metadata
+        = nmem_malloc(nmem,
                       sizeof(struct record_metadata*) * num_metadata);
-    memset(record->metadata, 0, 
-           sizeof(struct record_metadata*) * num_metadata);
-    
-    record->sortkeys  
-        = nmem_malloc(nmem, 
+    for (i = 0; i < num_metadata; i++)
+        record->metadata[i] = 0;
+
+    record->sortkeys
+        = nmem_malloc(nmem,
                       sizeof(union data_types*) * num_sortkeys);
-    memset(record->metadata, 0, 
-           sizeof(union data_types*) * num_sortkeys);
-    
-    
-    return record;
-}
+    for (i = 0; i < num_sortkeys; i++)
+        record->sortkeys[i] = 0;
 
+    record->position = position;
 
-struct record_metadata * record_add_metadata_fieldno(NMEM nmem, 
-                                                     struct record * record,
-                                                     int fieldno, 
-                                                     union data_types data)
-{
-    struct record_metadata * rmd = 0;
-    
-    if (!record || fieldno < 0 
-        || !record->metadata || !record->metadata[fieldno] )
-        return 0;
+    for (i = 0; name[i]; i++)
+        h = h * 65509 + ((unsigned char *) name)[i];
+
+    record->checksum = h;
 
-    // construct new record_metadata    
-    rmd  = nmem_malloc(nmem, sizeof(struct record_metadata));
-    rmd->data = data;
-    rmd->next = 0;
+    return record;
+}
 
-    // still needs to be assigned ..
+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;
+}
 
-    return rmd;
-    
-};
 
+int record_compare(struct record *r1, struct record *r2,
+                   struct conf_service *service)
+{
+    int i;
+    for (i = 0; i < service->num_metadata; i++)
+    {
+        struct conf_metadata *ser_md = &service->metadata[i];
+        enum conf_metadata_type type = ser_md->type;
+
+        struct record_metadata *m1 = r1->metadata[i];
+        struct record_metadata *m2 = r2->metadata[i];
+        while (m1 && m2)
+        {
+            switch (type)
+            {
+            case Metadata_type_generic:
+            case Metadata_type_skiparticle:
+                if (strcmp(m1->data.text.disp, m2->data.text.disp))
+                    return 0;
+                break;
+            case Metadata_type_date:
+            case Metadata_type_year:
+                if (m1->data.number.min != m2->data.number.min ||
+                    m1->data.number.max != m2->data.number.max)
+                    return 0;
+                break;
+            case Metadata_type_float:
+                if (m1->data.fnumber != m2->data.fnumber)
+                    return 0;
+            case Metadata_type_position:
+            case Metadata_type_relevance:
+            case Metadata_type_retrieval:
+                break;
+            }
+            m1 = m1->next;
+            m2 = m2->next;
+        }
+        if (m1 || m2)
+            return 0;
+    }
+    return 1;
+}
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+