-/* $Id: pazpar2.c,v 1.30 2007-01-15 04:34:28 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.36 2007-01-16 05:29:48 quinn Exp $ */
#include <stdlib.h>
#include <stdio.h>
p++;
}
if (buf != pout)
- *pout = '\0';
+ do {
+ *(pout--) = '\0';
+ }
+ while (pout > buf && *pout == ' ');
return buf;
}
{
int i;
+ if (!*value)
+ return;
for (i = 0; i < s->num_termlists; i++)
if (!strcmp(s->termlists[i].name, type))
break;
newm->next = 0;
if (md->type == Metadata_type_generic)
{
+ char *p;
newm->data.text = nmem_strdup(se->nmem, value);
+ for (p = newm->data.text + strlen(newm->data.text) - 1;
+ p > newm->data.text && strchr(" ,/.", *p); p--)
+ *p = '\0';
+
}
else if (md->type == Metadata_type_year)
{
{
struct record_metadata *mnode;
for (mnode = *wheretoput; mnode; mnode = mnode->next)
- if (!strcmp(mnode->data.text, mnode->data.text))
+ if (!strcmp(mnode->data.text, newm->data.text))
break;
if (!mnode)
{
normalize_mergekey(s,
(sk->type == Metadata_sortkey_skiparticle));
cluster->sortkeys[md->sortkey_offset]->text = s;
- yaz_log(YLOG_LOG, "SK Longest: %s", s);
}
}
}
(*wheretoput)->data.number.min = first;
if (last > (*wheretoput)->data.number.max)
(*wheretoput)->data.number.max = last;
- if (sk)
- {
- union data_types *sdata = cluster->sortkeys[md->sortkey_offset];
- sdata->number.min = first;
- sdata->number.max = last;
- }
}
+#ifdef GAGA
if (sk)
{
union data_types *sdata = cluster->sortkeys[md->sortkey_offset];
yaz_log(YLOG_LOG, "SK range: %d-%d", sdata->number.min, sdata->number.max);
}
+#endif
}
else
yaz_log(YLOG_WARN, "Don't know how to merge on element name %s", md->name);