X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Fyaz-z-cache.cpp;h=1468b7df8af9e096e26ba71ee0bbfddd60feaa1f;hb=8cd77956b745e79b984bc0c9b74989aeae8dd49d;hp=a79f6c1527190be2467ecb5be79f9189234408b9;hpb=f210f2580a43fd57b72a5db7d78688b5b17f19c8;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-cache.cpp b/src/yaz-z-cache.cpp
index a79f6c1..1468b7d 100644
--- a/src/yaz-z-cache.cpp
+++ b/src/yaz-z-cache.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-cache.cpp,v 1.3 2003-07-25 19:28:07 adam Exp $
+ * $Id: yaz-z-cache.cpp,v 1.6 2003-10-08 08:52:59 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -21,6 +21,7 @@ Yaz_RecordCache::Yaz_RecordCache ()
     m_entries = 0;
     m_presentRequest = 0;
     m_searchRequest = 0;
+    m_max_size = 200000;
 }
 
 Yaz_RecordCache::~Yaz_RecordCache ()
@@ -28,6 +29,11 @@ Yaz_RecordCache::~Yaz_RecordCache ()
     nmem_destroy(m_mem);
 }
 
+void Yaz_RecordCache::set_max_size(int sz)
+{
+    m_max_size = sz;
+}
+
 void Yaz_RecordCache::clear ()
 {
     nmem_destroy(m_mem);
@@ -80,6 +86,8 @@ void Yaz_RecordCache::copy_presentRequest(Z_PresentRequest *pr)
 void Yaz_RecordCache::add (ODR o, Z_NamePlusRecordList *npr, int start,
 			   int hits)
 {
+    if (nmem_total(m_mem) > m_max_size)
+	return;
     // Build appropriate compspec for this response
     Z_RecordComposition *comp = 0;
     if (hits == -1 && m_presentRequest)
@@ -143,6 +151,8 @@ int Yaz_RecordCache::match (Yaz_RecordCache_Entry *entry,
     if (!match)
 	return 0;
 
+    if (!syntax)
+	return 0;
     // See if offset, OID match..
     if (entry->m_offset == offset &&
 	entry->m_record->which == Z_NamePlusRecord_databaseRecord &&
@@ -158,7 +168,7 @@ int Yaz_RecordCache::lookup (ODR o, Z_NamePlusRecordList **npr,
 			     Z_RecordComposition *comp)
 {
     int i;
-    yaz_log(LOG_LOG, "cache lookup start=%d num=%d", start, num);
+    yaz_log(LOG_DEBUG, "cache lookup start=%d num=%d", start, num);
 
     for (i = 0; i<num; i++)
     {