X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-record-cache.c;h=957e8f911b3bb1e457a8d2eb485261d610281fa0;hp=9e76d66b78d0ef14817ec4d96d63f5a49310698e;hb=f0600e1e958cb80099c4a7fa4cc56a9c1db83735;hpb=9c32d63a1113f58ceb168e8321f1e360b2006e3b

diff --git a/src/zoom-record-cache.c b/src/zoom-record-cache.c
index 9e76d66..957e8f9 100644
--- a/src/zoom-record-cache.c
+++ b/src/zoom-record-cache.c
@@ -128,45 +128,13 @@ void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
                            Z_SRW_diagnostic *diag)
 {
     record_cache_add(r, npr, pos, syntax, elementSetName, schema, diag);
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
-    if (r->connection->mc_st &&
-        !diag && npr->which == Z_NamePlusRecord_databaseRecord)
-    {
-        WRBUF k = wrbuf_alloc();
-        uint32_t flags = 0;
-        memcached_return_t rc;
-        time_t expiration = 36000;
-        ODR odr = odr_createmem(ODR_ENCODE);
-        char *rec_buf;
-        int rec_len;
-
-        z_NamePlusRecord(odr, &npr, 0, 0);
-        rec_buf = odr_getbuf(odr, &rec_len, 0);
-
-        wrbuf_write(k, wrbuf_buf(r->mc_key), wrbuf_len(r->mc_key));
-        wrbuf_printf(k, ";%d;%s;%s;%s", pos,
-                     syntax ? syntax : "",
-                     elementSetName ? elementSetName : "",
-                     schema ? schema : "");
-        rc = memcached_set(r->connection->mc_st,
-                           wrbuf_buf(k),wrbuf_len(k),
-                           rec_buf, rec_len,
-                           expiration, flags);
-
-        yaz_log(YLOG_LOG, "Store record lkey=%s len=%d rc=%u %s",
-                wrbuf_cstr(k), rec_len, (unsigned) rc,
-                memcached_last_error_message(r->connection->mc_st));
-        odr_destroy(odr);
-        wrbuf_destroy(k);
-    }
-#endif
+    ZOOM_memcached_add(r, npr, pos, syntax, elementSetName, schema, diag);
 }
 
-
-ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,
-                                     const char *syntax,
-                                     const char *elementSetName,
-                                     const char *schema)
+ZOOM_record ZOOM_record_cache_lookup_i(ZOOM_resultset r, int pos,
+                                       const char *syntax,
+                                       const char *elementSetName,
+                                       const char *schema)
 {
     ZOOM_record_cache rc;
 
@@ -183,44 +151,27 @@ ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,
             return &rc->rec;
         }
     }
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
-    if (r->connection && r->connection->mc_st)
-    {
-        WRBUF k = wrbuf_alloc();
-        size_t v_len;
-        char *v_buf;
-        uint32_t flags;
-        memcached_return_t rc;
-
-        wrbuf_write(k, wrbuf_buf(r->mc_key), wrbuf_len(r->mc_key));
-        wrbuf_printf(k, ";%d;%s;%s;%s", pos,
-                     syntax ? syntax : "",
-                     elementSetName ? elementSetName : "",
-                     schema ? schema : "");
-
-        yaz_log(YLOG_LOG, "Lookup record %s", wrbuf_cstr(k));
-        v_buf = memcached_get(r->connection->mc_st, wrbuf_buf(k), wrbuf_len(k),
-                              &v_len, &flags, &rc);
-        wrbuf_destroy(k);
-        if (v_buf)
-        {
-            Z_NamePlusRecord *npr = 0;
-
-            odr_setbuf(r->odr, v_buf, v_len, 0);
+    return 0;
+}
 
-            z_NamePlusRecord(r->odr, &npr, 0, 0);
-            free(v_buf);
-            if (npr)
-            {
-                yaz_log(YLOG_LOG, "returned memcached copy");
-                return record_cache_add(r, npr, pos, syntax, elementSetName,
-                                        schema, 0);
-            }
-            yaz_log(YLOG_WARN, "memcached_get npr failed v_len=%ld",
-                    (long) v_len);
-        }
+ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,
+                                     const char *syntax,
+                                     const char *elementSetName,
+                                     const char *schema)
+{
+    Z_NamePlusRecord *npr;
+    ZOOM_record rec = ZOOM_record_cache_lookup_i(r, pos, syntax,
+                                                 elementSetName, schema);
+    if (rec)
+    {
+        ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
+        ZOOM_connection_put_event(r->connection, event);
+        return rec;
     }
-#endif
+    npr = ZOOM_memcached_lookup(r, pos, syntax, elementSetName, schema);
+    if (npr)
+        return record_cache_add(r, npr, pos, syntax, elementSetName,
+                                schema, 0);
     return 0;
 }