X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=perl%2Fzebra_perl.c;h=147d2acc2a9bd62056a26c73b1c9f3ecfa1c101a;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hp=793c4103fa32b416d6e5e038d46c633a04912c65;hpb=8ee402d79e37344b08c2b54ad45b50e8327a6c03;p=idzebra-moved-to-github.git

diff --git a/perl/zebra_perl.c b/perl/zebra_perl.c
index 793c410..147d2ac 100644
--- a/perl/zebra_perl.c
+++ b/perl/zebra_perl.c
@@ -1,37 +1,33 @@
-#if 0
-#include "zebraapi.h"
-#endif
-
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
 #include <yaz/yaz-util.h>
 #include <yaz/proto.h>
-#include <yaz/log.h>
+#include <yaz/ylog.h>
 #include <yaz/cql.h>
 #include <yaz/pquery.h>
 
 #include "zebra_perl.h"
 #include "../recctrl/perlread.h"
-#include <data1.h>
+#include <idzebra/data1.h>
 
 NMEM handles;
 
 void init (void) {
   nmem_init ();
   yaz_log_init_prefix ("ZebraPerl");
-  yaz_log (LOG_LOG, "Zebra API initialized");
+  yaz_log (YLOG_LOG, "Zebra API initialized");
 }
 
 void DESTROY (void) {
   nmem_exit ();
-  yaz_log (LOG_LOG, "Zebra API destroyed");
+  yaz_log (YLOG_LOG, "Zebra API destroyed");
 }   
 
 /* Logging facilities from yaz */
 void logMsg (int level, const char *message) {
-  logf(level, "%s", message);
+  yaz_log(level, "%s", message);
 }
 
 /* debug tool for data1... maybe should be moved to data1. 
@@ -123,7 +119,7 @@ void records_retrieve(ZebraHandle zh,
   } else {
     schema = oid_getvalbyname (a_schema);
     if (schema == VAL_NONE) {
-      logf(LOG_WARN,"unknown schema '%s'",a_schema);
+      yaz_log(YLOG_WARN,"unknown schema '%s'",a_schema);
     }
   }
 
@@ -133,7 +129,7 @@ void records_retrieve(ZebraHandle zh,
   } else {
     recordsyntax = oid_getvalbyname (a_format);
     if (recordsyntax == VAL_NONE) {
-      logf(LOG_WARN,"unknown record syntax '%s', using SUTRS",a_schema);
+      yaz_log(YLOG_WARN,"unknown record syntax '%s', using SUTRS",a_schema);
       recordsyntax = VAL_SUTRS;
     }
   }
@@ -213,7 +209,7 @@ int zebra_cql2pqf (cql_transform_t ct,
 
   if (cql_transform_buf(ct, cql_parser_result(cp), res, len)) {
     status = cql_transform_error(ct, &addinfo);
-    logf (LOG_WARN,"Transform error %d %s\n", status, addinfo ? addinfo : "");
+    yaz_log (YLOG_WARN,"Transform error %d %s\n", status, addinfo ? addinfo : "");
     cql_parser_destroy(cp);
     return (status);
   }
@@ -234,18 +230,18 @@ void zebra_scan_PQF (ZebraHandle zh,
   ZebraScanEntry *entries;
   int i, class;
 
-  logf(LOG_DEBUG,  
+  yaz_log(YLOG_DEBUG,  
        "scan req: pos:%d, num:%d, partial:%d", 
        so->position, so->num_entries, so->is_partial);
 
   zapt = p_query_scan (stream, PROTO_Z3950, &attrsetid, pqf_query);
 
   oidname = yaz_z3950oid_to_str (attrsetid, &class); 
-  logf (LOG_DEBUG, "Attributreset: %s", oidname);
+  yaz_log (YLOG_DEBUG, "Attributreset: %s", oidname);
   attributeset = oid_getvalbyname(oidname);
 
   if (!zapt) {
-    logf (LOG_WARN, "bad query %s\n", pqf_query);
+    yaz_log (YLOG_WARN, "bad query %s\n", pqf_query);
     odr_reset (stream);
     return;
   }
@@ -258,7 +254,7 @@ void zebra_scan_PQF (ZebraHandle zh,
 	      &so->position, &so->num_entries, 
 	      (ZebraScanEntry **) &so->entries, &so->is_partial);
 
-  logf(LOG_DEBUG, 
+  yaz_log(YLOG_DEBUG, 
        "scan res: pos:%d, num:%d, partial:%d", 
        so->position, so->num_entries, so->is_partial);
 }