X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=b7fcfece770ff8fd568fb9e3a4860031e4dce5d0;hb=601854b8d4fa5992f037679d15baabcea211ff8b;hp=250734ebb5c76268de284a76fa7c3f1724ea7797;hpb=0aa1114a00aa7d78e6e9dd8099f4c9b3d93f5f94;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index 250734e..b7fcfec 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 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
@@ -1236,67 +1236,60 @@ void show_single_stop(struct session *se, struct record_cluster *rec)
 
 struct record_cluster **show_range_start(struct session *se,
                                          struct reclist_sortparms *sp,
-                                         int start, int *num, int *total, Odr_int *sumhits, Odr_int *approx_hits)
+                                         int start, int *num, int *total,
+                                         Odr_int *sumhits, Odr_int *approx_hits)
 {
-    struct record_cluster **recs;
+    struct record_cluster **recs = 0;
     struct reclist_sortparms *spp;
+    struct client_list *l;
     int i;
 #if USE_TIMING
     yaz_timing_t t = yaz_timing_create();
 #endif
     session_enter(se, "show_range_start");
-    recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
-    if (!se->relevance)
+    *sumhits = 0;
+    *approx_hits = 0;
+    *total = 0;
+    reclist_limit(se->reclist, se);
+    if (se->relevance)
     {
-        *num = 0;
-        *total = 0;
-        *sumhits = 0;
-        *approx_hits = 0;
-        recs = 0;
-    }
-    else
-    {
-        struct client_list *l;
-
-        reclist_limit(se->reclist, se);
-
         for (spp = sp; spp; spp = spp->next)
             if (spp->type == Metadata_sortkey_relevance)
             {
                 relevance_prepare_read(se->relevance, se->reclist);
                 break;
             }
-        reclist_sort(se->reclist, sp);
-
-        reclist_enter(se->reclist);
-        *total = reclist_get_num_records(se->reclist);
-
-        *sumhits = 0;
-        *approx_hits = 0;
         for (l = se->clients_active; l; l = l->next) {
             *sumhits += client_get_hits(l->client);
             *approx_hits += client_get_approximation(l->client);
         }
-        for (i = 0; i < start; i++)
-            if (!reclist_read_record(se->reclist))
-            {
-                *num = 0;
-                recs = 0;
-                break;
-            }
+    }
+    reclist_sort(se->reclist, sp);
+
+    reclist_enter(se->reclist);
+    *total = reclist_get_num_records(se->reclist);
 
-        for (i = 0; i < *num; i++)
+    for (i = 0; i < start; i++)
+        if (!reclist_read_record(se->reclist))
         {
-            struct record_cluster *r = reclist_read_record(se->reclist);
-            if (!r)
-            {
-                *num = i;
-                break;
-            }
-            recs[i] = r;
+            *num = 0;
+            break;
         }
-        reclist_leave(se->reclist);
+
+    if (*num > 0)
+        recs =
+            nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
+    for (i = 0; i < *num; i++)
+    {
+        struct record_cluster *r = reclist_read_record(se->reclist);
+        if (!r)
+        {
+            *num = i;
+            break;
+        }
+        recs[i] = r;
     }
+    reclist_leave(se->reclist);
 #if USE_TIMING
     yaz_timing_stop(t);
     yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f",
@@ -1781,6 +1774,7 @@ static int ingest_to_cluster(struct client *cl,
     struct conf_service *service = se->service;
     int term_factor = 1;
     struct record_cluster *cluster;
+    struct record_metadata **metadata0;
     struct session_database *sdb = client_get_database(cl);
     struct record *record = record_create(se->nmem,
                                           service->num_metadata,
@@ -1876,6 +1870,11 @@ static int ingest_to_cluster(struct client *cl,
 
     relevance_newrec(se->relevance, cluster);
 
+    // original metadata, to check if first existence of a field
+    metadata0 = xmalloc(sizeof(*metadata0) * service->num_metadata);
+    memcpy(metadata0, cluster->metadata,
+           sizeof(*metadata0) * service->num_metadata);
+
     // now parsing XML record and adding data to cluster or record metadata
     for (n = root->children; n; n = n->next)
     {
@@ -1921,6 +1920,9 @@ static int ingest_to_cluster(struct client *cl,
             // merged metadata
             rec_md = record_metadata_init(se->nmem, (const char *) value,
                                           ser_md->type, 0);
+
+            // see if the field was not in cluster already (from beginning)
+
             if (!rec_md)
                 continue;
 
@@ -1929,9 +1931,16 @@ static int ingest_to_cluster(struct client *cl,
 
             wheretoput = &cluster->metadata[md_field_id];
 
-            // and polulate with data:
-            // assign cluster or record based on merge action
-            if (ser_md->merge == Metadata_merge_unique)
+            if (ser_md->merge == Metadata_merge_first)
+            {
+                if (!metadata0[md_field_id])
+                {
+                    while (*wheretoput)
+                        wheretoput = &(*wheretoput)->next;
+                    *wheretoput = rec_md;
+                }
+            }
+            else if (ser_md->merge == Metadata_merge_unique)
             {
                 while (*wheretoput)
                 {
@@ -2057,6 +2066,7 @@ static int ingest_to_cluster(struct client *cl,
     if (value)
         xmlFree(value);
 
+    xfree(metadata0);
     relevance_donerecord(se->relevance, cluster);
     se->total_records++;