X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Flogic.c;h=be2ec0493162dec09bba9f5b89a388452cba807f;hb=11994049975d40a0010d0dca01156bc80171b448;hp=9cfcd08f7067760929cee6fda7730dda8836ba59;hpb=837ce54389667b8c40b2961dd76403e932b6bd92;p=pazpar2-moved-to-github.git

diff --git a/src/logic.c b/src/logic.c
index 9cfcd08..be2ec04 100644
--- a/src/logic.c
+++ b/src/logic.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   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
@@ -92,7 +92,7 @@ static void log_xml_doc(xmlDoc *doc)
 #endif
     if (lf && len)
     {
-        fwrite(result, 1, len, lf);
+        (void) fwrite(result, 1, len, lf);
         fprintf(lf, "\n");
     }
     xmlFree(result);
@@ -719,7 +719,7 @@ struct record_cluster *show_single(struct session *s, const char *id,
 }
 
 struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, 
-                             int start, int *num, int *total, int *sumhits, 
+                             int start, int *num, int *total, Odr_int *sumhits, 
                              NMEM nmem_show)
 {
     struct record_cluster **recs = nmem_malloc(nmem_show, *num 
@@ -822,15 +822,38 @@ void pazpar2_event_loop()
 }
 
 static struct record_metadata *record_metadata_init(
-    NMEM nmem, char *value, enum conf_metadata_type type)
+    NMEM nmem, const char *value, enum conf_metadata_type type,
+    struct _xmlAttr *attr)
 {
     struct record_metadata *rec_md = record_metadata_create(nmem);
+    struct record_metadata_attr **attrp = &rec_md->attributes;
+    
+    for (; attr; attr = attr->next)
+    {
+        if (attr->children && attr->children->content)
+        {
+            if (strcmp((const char *) attr->name, "type"))
+            {  /* skip the "type" attribute.. Its value is already part of
+                  the element in output (md-%s) and so repeating it here
+                  is redundant */
+                *attrp = nmem_malloc(nmem, sizeof(**attrp));
+                (*attrp)->name =
+                    nmem_strdup(nmem, (const char *) attr->name);
+                (*attrp)->value =
+                    nmem_strdup(nmem, (const char *) attr->children->content);
+                attrp = &(*attrp)->next;
+            }
+        }
+    }
+    *attrp = 0;
+
     if (type == Metadata_type_generic)
     {
-        char * p = value;
+        char *p = nmem_strdup(nmem, value);
+
         p = normalize7bit_generic(p, " ,/.:([");
         
-        rec_md->data.text.disp = nmem_strdup(nmem, p);
+        rec_md->data.text.disp = p;
         rec_md->data.text.sort = 0;
     }
     else if (type == Metadata_type_year || type == Metadata_type_date)
@@ -872,17 +895,17 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
                     pp2_relevance_token_t prt =
                         pp2_relevance_tokenize(
                             service->mergekey_pct,
-                            (const char *) value);
+                            (const char *) value, 0);
                     
+                    if (wrbuf_len(norm_wr) > 0)
+                        wrbuf_puts(norm_wr, " ");
                     wrbuf_puts(norm_wr, name);
-                    wrbuf_puts(norm_wr, "=");
                     while ((norm_str =
                             pp2_relevance_token_next(prt)))
                     {
                         if (*norm_str)
                         {
-                            if (wrbuf_len(norm_wr))
-                                wrbuf_puts(norm_wr, " ");
+                            wrbuf_puts(norm_wr, " ");
                             wrbuf_puts(norm_wr, norm_str);
                         }
                     }
@@ -912,7 +935,7 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
         pp2_relevance_token_t prt =
             pp2_relevance_tokenize(
                 service->mergekey_pct,
-                (const char *) mergekey);
+                (const char *) mergekey, 0);
         
         while ((norm_str = pp2_relevance_token_next(prt)))
         {
@@ -1121,8 +1144,8 @@ struct record *ingest_record(struct client *cl, const char *rec,
             }
 
             // non-merged metadata
-            rec_md = record_metadata_init(se->nmem, (char *) value,
-                                          ser_md->type);
+            rec_md = record_metadata_init(se->nmem, (const char *) value,
+                                          ser_md->type, n->properties);
             if (!rec_md)
             {
                 yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'",
@@ -1135,8 +1158,8 @@ struct record *ingest_record(struct client *cl, const char *rec,
             *wheretoput = rec_md;
 
             // merged metadata
-            rec_md = record_metadata_init(se->nmem, (char *) value,
-                                          ser_md->type);
+            rec_md = record_metadata_init(se->nmem, (const char *) value,
+                                          ser_md->type, 0);
             wheretoput = &cluster->metadata[md_field_id];
 
             // and polulate with data:
@@ -1174,11 +1197,11 @@ struct record *ingest_record(struct client *cl, const char *rec,
                          
                         prt = pp2_relevance_tokenize(
                             service->sort_pct,
-                            rec_md->data.text.disp);
+                            rec_md->data.text.disp, skip_article);
 
                         pp2_relevance_token_next(prt);
                          
-                        sort_str = pp2_get_sort(prt, skip_article);
+                        sort_str = pp2_get_sort(prt);
                          
                         cluster->sortkeys[sk_field_id]->text.disp = 
                             rec_md->data.text.disp;
@@ -1229,7 +1252,8 @@ struct record *ingest_record(struct client *cl, const char *rec,
             // ranking of _all_ fields enabled ... 
             if (ser_md->rank)
                 relevance_countwords(se->relevance, cluster, 
-                                     (char *) value, ser_md->rank);
+                                     (char *) value, ser_md->rank,
+                                     ser_md->name);
 
             // construct facets ... 
             if (ser_md->termlist)