MARCXML parsing: avoid skipping 1st field if no leader YAZ-693

[yaz-moved-to-github.git] / src / zoom-sru.c

diff --git a/src/zoom-sru.c b/src/zoom-sru.c
index 3e668a4..0776057 100644 (file)
--- a/src/zoom-sru.c
+++ b/src/zoom-sru.c
@@ -62,8 +62,29 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr)
 static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type)
 {
     Z_SRW_PDU *sr = yaz_srw_get_pdu(c->odr_out, type, c->sru_version);
-    sr->username = c->user;
-    sr->password = c->password;
+    if (c->url_authentication && c->user)
+    {
+        Z_SRW_extra_arg **ea = &sr->extra_args;
+        while (*ea)
+            ea = &(*ea)->next;
+        *ea = (Z_SRW_extra_arg *) odr_malloc(c->odr_out, sizeof(**ea));
+        (*ea)->name = "x-username";
+        (*ea)->value = c->user;
+        ea = &(*ea)->next;
+        if (c->password)
+        {
+            *ea = (Z_SRW_extra_arg *) odr_malloc(c->odr_out, sizeof(**ea));
+            (*ea)->name = "x-password";
+            (*ea)->value = c->password;
+            ea = &(*ea)->next;
+        }
+        *ea = 0;
+    }
+    else
+    {
+        sr->username = c->user;
+        sr->password = c->password;
+    }
     return sr;
 }
 #endif
@@ -130,6 +151,7 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
     ZOOM_resultset resultset = 0;
     Z_SRW_PDU *sr = 0;
     const char *option_val = 0;
+    const char *schema = 0;
     Z_Query *z_query;
     Z_FacetList *facet_list = 0;
     if (c->error)                  /* don't continue on error */
@@ -147,9 +169,11 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
         facets = ZOOM_options_get(resultset->options, "facets");
         if (facets)
             facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets);
+        schema = c->tasks->u.search.schema;
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
+        schema = c->tasks->u.retrieve.schema;
 
         start = &c->tasks->u.retrieve.start;
         count = &c->tasks->u.retrieve.count;
@@ -164,7 +188,8 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
             ZOOM_record rec =
                 ZOOM_record_cache_lookup(resultset, i + *start,
                                          c->tasks->u.retrieve.syntax,
-                                         c->tasks->u.retrieve.elementSetName);
+                                         c->tasks->u.retrieve.elementSetName,
+                                         schema);
             if (!rec)
                 break;
             else
@@ -216,7 +241,7 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
     sr->u.request->maximumRecords = odr_intdup(
         c->odr_out, (resultset->step > 0 && resultset->step < *count) ?
         resultset->step : *count);
-    sr->u.request->recordSchema = resultset->schema;
+    sr->u.request->recordSchema = odr_strdup_null(c->odr_out, schema);
     sr->u.request->facetList = facet_list;
 
     option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
@@ -243,7 +268,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
     NMEM nmem;
     ZOOM_Event event;
     int *start, *count;
-    const char *syntax, *elementSetName;
+    const char *syntax, *elementSetName, *schema;
 
     if (!c->tasks)
         return zoom_complete;
@@ -256,7 +281,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         count = &c->tasks->u.search.count;
         syntax = c->tasks->u.search.syntax;
         elementSetName = c->tasks->u.search.elementSetName;
-
+        schema = c->tasks->u.search.schema;
         /* Required not for reporting client hit count multiple times into session */
         if (!c->tasks->u.search.recv_search_fired) {
             yaz_log(YLOG_DEBUG, "posting ZOOM_EVENT_RECV_SEARCH");
@@ -273,6 +298,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         count = &c->tasks->u.retrieve.count;
         syntax = c->tasks->u.retrieve.syntax;
         elementSetName = c->tasks->u.retrieve.elementSetName;
+        schema = c->tasks->u.retrieve.schema;
         break;
     default:
         return zoom_complete;
@@ -342,7 +368,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
                                                  resultset->odr);
             }
             ZOOM_record_cache_add(resultset, npr, pos, syntax, elementSetName,
-                                  sru_rec->recordSchema, diag);
+                                  schema, diag);
         }
         *count -= i;
         *start += i;