Introducing namespace yazpp_1 for all YAZ++ functions. This will

[yazpp-moved-to-github.git] / src / yaz-z-cache.cpp

diff --git a/src/yaz-z-cache.cpp b/src/yaz-z-cache.cpp
index b0729a4..011ba99 100644 (file)
--- a/src/yaz-z-cache.cpp
+++ b/src/yaz-z-cache.cpp
@@ -2,13 +2,16 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-cache.cpp,v 1.8 2004-01-24 21:32:31 adam Exp $
+ * $Id: yaz-z-cache.cpp,v 1.12 2005-06-02 06:40:21 adam Exp $
  */
 
 #include <yaz/log.h>
-#include <yaz++/proxy.h>
+#include <yaz/proto.h>
+#include <yaz++/record-cache.h>
 
-struct Yaz_RecordCache_Entry {
+using namespace yazpp_1;
+
+struct yazpp_1::Yaz_RecordCache_Entry {
     int m_offset;
     Z_NamePlusRecord *m_record;
     Z_RecordComposition *m_comp;
@@ -167,7 +170,7 @@ int Yaz_RecordCache::match (Yaz_RecordCache_Entry *entry,
     oid_to_dotstring(entry->m_record->u.databaseRecord->direct_reference, mstr1);
     char mstr2[100];
     oid_to_dotstring(syntax, mstr2);
-    yaz_log(LOG_LOG, "match fail 3 d=%s s=%s", mstr1, mstr2);
+    yaz_log(YLOG_LOG, "match fail 3 d=%s s=%s", mstr1, mstr2);
 #endif
 
     return 0;
@@ -179,7 +182,7 @@ int Yaz_RecordCache::lookup (ODR o, Z_NamePlusRecordList **npr,
                             Z_RecordComposition *comp)
 {
     int i;
-    yaz_log(LOG_DEBUG, "cache lookup start=%d num=%d", start, num);
+    yaz_log(YLOG_DEBUG, "cache lookup start=%d num=%d", start, num);
 
     for (i = 0; i<num; i++)
     {