Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --combined src/session.c
index 0c914ca,5302971..61f7e54
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -981,10 -981,7 +981,10 @@@ static int get_mergekey_from_doc(xmlDo
          if (!strcmp((const char *) n->name, "metadata"))
          {
              xmlChar *type = xmlGetProp(n, (xmlChar *) "type");
 -            if (!strcmp(name, (const char *) type))
 +            if (type == NULL) {
 +                yaz_log(YLOG_FATAL, "Missing type attribute on metadata element. Skipping!");
 +            }
 +            else if (!strcmp(name, (const char *) type))
              {
                  xmlChar *value = xmlNodeListGetString(doc, n->children, 1);
                  if (value)
@@@ -1143,6 -1140,7 +1143,7 @@@ static int ingest_to_cluster(struct cli
      \param cl client holds the result set for record
      \param rec record buffer (0 terminated)
      \param record_no record position (1, 2, ..)
+     \param nmem working NMEM
      \retval 0 OK
      \retval -1 failure
  */