ZOOM: save record schema per request; fix caching

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

diff --git a/src/zoom-sru.c b/src/zoom-sru.c
index b0a008b..b997eeb 100644 (file)
--- a/src/zoom-sru.c
+++ b/src/zoom-sru.c
@@ -18,8 +18,6 @@
 #include <yaz/log.h>
 #include <yaz/pquery.h>
 
-void handle_facet_list(ZOOM_resultset r, Z_FacetList *fl);
-
 #if YAZ_HAVE_XML2
 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)
 {
@@ -132,6 +130,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 */
@@ -149,9 +148,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;
@@ -166,7 +167,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
@@ -218,7 +220,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");
@@ -267,7 +269,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
             c->tasks->u.search.recv_search_fired = 1;
         }
         if (res->facetList)
-            handle_facet_list(resultset, res->facetList);
+            ZOOM_handle_facet_list(resultset, res->facetList);
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
@@ -404,8 +406,12 @@ int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
         Z_SRW_PDU *sr;
         ret = yaz_solr_decode_response(c->odr_in, hres, &sr);
         if (ret == 0)
+        {
             if (sr->which == Z_SRW_searchRetrieve_response)
                 *cret = handle_srw_response(c, sr->u.response);
+            else if (sr->which == Z_SRW_scan_response)
+                handle_srw_scan_response(c, sr->u.scan_response);
+        }
     }
     else
     {