Removed ODRs from zebra_search

[idzebra-moved-to-github.git] / perl / IDZebra_wrap.c

diff --git a/perl/IDZebra_wrap.c b/perl/IDZebra_wrap.c
index e147810..eab4a79 100644 (file)
--- a/perl/IDZebra_wrap.c
+++ b/perl/IDZebra_wrap.c
@@ -212,7 +212,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
  * perl5.swg
  *
  * Perl5 runtime library
- * $Header: /home/cvsroot/idis/perl/Attic/IDZebra_wrap.c,v 1.16 2003-03-13 04:25:17 pop Exp $
+ * $Header: /home/cvsroot/idis/perl/Attic/IDZebra_wrap.c,v 1.18 2003-05-21 08:03:02 pop Exp $
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -3010,7 +3010,7 @@ XS(_wrap_logLevel) {
             SWIG_croak("Usage: logLevel(level);");
         }
         arg1 = (int) SvIV(ST(0));
-        logLevel(arg1);
+        yaz_log_init_level(arg1);
         
         
         XSRETURN(argvi);
@@ -3034,7 +3034,7 @@ XS(_wrap_logFile) {
         }
         if (!SvOK((SV*) ST(0))) arg1 = 0;
         else arg1 = (char *) SvPV(ST(0), PL_na);
-        logFile((char const *)arg1);
+        yaz_log_init_file((char const *)arg1);
         
         
         XSRETURN(argvi);
@@ -3071,6 +3071,54 @@ XS(_wrap_logMsg) {
 }
 
 
+XS(_wrap_logPrefix) {
+    char _swigmsg[SWIG_MAX_ERRMSG] = "";
+    const char *_swigerr = _swigmsg;
+    {
+        char *arg1 ;
+        int argvi = 0;
+        dXSARGS;
+        
+        if ((items < 1) || (items > 1)) {
+            SWIG_croak("Usage: logPrefix(prefix);");
+        }
+        if (!SvOK((SV*) ST(0))) arg1 = 0;
+        else arg1 = (char *) SvPV(ST(0), PL_na);
+        yaz_log_init_prefix((char const *)arg1);
+        
+        
+        XSRETURN(argvi);
+        fail:
+        (void) _swigerr;
+    }
+    croak(_swigerr);
+}
+
+
+XS(_wrap_logPrefix2) {
+    char _swigmsg[SWIG_MAX_ERRMSG] = "";
+    const char *_swigerr = _swigmsg;
+    {
+        char *arg1 ;
+        int argvi = 0;
+        dXSARGS;
+        
+        if ((items < 1) || (items > 1)) {
+            SWIG_croak("Usage: logPrefix2(prefix);");
+        }
+        if (!SvOK((SV*) ST(0))) arg1 = 0;
+        else arg1 = (char *) SvPV(ST(0), PL_na);
+        yaz_log_init_prefix2((char const *)arg1);
+        
+        
+        XSRETURN(argvi);
+        fail:
+        (void) _swigerr;
+    }
+    croak(_swigerr);
+}
+
+
 XS(_wrap_odr_createmem) {
     char _swigmsg[SWIG_MAX_ERRMSG] = "";
     const char *_swigerr = _swigmsg;
@@ -4146,16 +4194,14 @@ XS(_wrap_search_PQF) {
     const char *_swigerr = _swigmsg;
     {
         ZebraHandle arg1 ;
-        ODR arg2 ;
-        ODR arg3 ;
-        char *arg4 ;
-        char *arg5 ;
+        char *arg2 ;
+        char *arg3 ;
         int result;
         int argvi = 0;
         dXSARGS;
         
-        if ((items < 5) || (items > 5)) {
-            SWIG_croak("Usage: search_PQF(zh,odr_input,odr_output,pqf_query,setname);");
+        if ((items < 3) || (items > 3)) {
+            SWIG_croak("Usage: search_PQF(zh,pqf_query,setname);");
         }
         {
             ZebraHandle * argp;
@@ -4164,25 +4210,11 @@ XS(_wrap_search_PQF) {
             }
             arg1 = *argp;
         }
-        {
-            ODR * argp;
-            if (SWIG_ConvertPtr(ST(1),(void **) &argp, SWIGTYPE_p_ODR,0) < 0) {
-                SWIG_croak("Type error in argument 2 of search_PQF. Expected _p_ODR");
-            }
-            arg2 = *argp;
-        }
-        {
-            ODR * argp;
-            if (SWIG_ConvertPtr(ST(2),(void **) &argp, SWIGTYPE_p_ODR,0) < 0) {
-                SWIG_croak("Type error in argument 3 of search_PQF. Expected _p_ODR");
-            }
-            arg3 = *argp;
-        }
-        if (!SvOK((SV*) ST(3))) arg4 = 0;
-        else arg4 = (char *) SvPV(ST(3), PL_na);
-        if (!SvOK((SV*) ST(4))) arg5 = 0;
-        else arg5 = (char *) SvPV(ST(4), PL_na);
-        result = (int)zebra_search_PQF(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5);
+        if (!SvOK((SV*) ST(1))) arg2 = 0;
+        else arg2 = (char *) SvPV(ST(1), PL_na);
+        if (!SvOK((SV*) ST(2))) arg3 = 0;
+        else arg3 = (char *) SvPV(ST(2), PL_na);
+        result = (int)zebra_search_PQF(arg1,(char const *)arg2,(char const *)arg3);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
@@ -8492,6 +8524,8 @@ static swig_command_info swig_commands[] = {
 {"IDZebrac::logLevel", _wrap_logLevel},
 {"IDZebrac::logFile", _wrap_logFile},
 {"IDZebrac::logMsg", _wrap_logMsg},
+{"IDZebrac::logPrefix", _wrap_logPrefix},
+{"IDZebrac::logPrefix2", _wrap_logPrefix2},
 {"IDZebrac::odr_createmem", _wrap_odr_createmem},
 {"IDZebrac::odr_reset", _wrap_odr_reset},
 {"IDZebrac::odr_destroy", _wrap_odr_destroy},