X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=perl%2FIDZebra_wrap.c;h=cbf5b832f484229137cf86e996700d3aac2d9662;hb=8c703765dad3228649e340337b293f76603ca9de;hp=256cfac5b7886bad4f135178aa04c90575f29ace;hpb=b9eea3a2ebd3feae59bc8c01a70dbe8b9e0b807a;p=idzebra-moved-to-github.git

diff --git a/perl/IDZebra_wrap.c b/perl/IDZebra_wrap.c
index 256cfac..cbf5b83 100644
--- 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.17 2003-05-07 20:51:12 pop Exp $
+ * $Header: /home/cvsroot/idis/perl/Attic/IDZebra_wrap.c,v 1.19 2003-07-07 10:59:33 pop Exp $
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -4031,14 +4031,16 @@ XS(_wrap_insert_record) {
         ZebraHandle arg1 ;
         recordGroup *arg2 ;
         char *arg3 ;
-        int arg4 ;
+        int *arg4 ;
         char *arg5 ;
         char *arg6 ;
         char *arg7 ;
         int arg8 ;
         int arg9 ;
         int result;
+        int dvalue4 ;
         int argvi = 0;
+        SV * _saved[1] ;
         dXSARGS;
         
         if ((items < 9) || (items > 9)) {
@@ -4058,7 +4060,18 @@ XS(_wrap_insert_record) {
         }
         if (!SvOK((SV*) ST(2))) arg3 = 0;
         else arg3 = (char *) SvPV(ST(2), PL_na);
-        arg4 = (int) SvIV(ST(3));
+        {
+            SV *tempsv;
+            if (!SvROK(ST(3))) {
+                SWIG_croak("expected a reference");
+            }
+            tempsv = SvRV(ST(3));
+            if (!SvIOK(tempsv)) {
+                SWIG_croak("expected a integer reference");
+            }
+            dvalue4 = SvIV(tempsv);
+            arg4 = &dvalue4;
+        }
         if (!SvOK((SV*) ST(4))) arg5 = 0;
         else arg5 = (char *) SvPV(ST(4), PL_na);
         if (!SvOK((SV*) ST(5))) arg6 = 0;
@@ -4067,10 +4080,16 @@ XS(_wrap_insert_record) {
         else arg7 = (char *) SvPV(ST(6), PL_na);
         arg8 = (int) SvIV(ST(7));
         arg9 = (int) SvIV(ST(8));
+        _saved[0] = ST(3);
         result = (int)zebra_insert_record(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,arg8,arg9);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
+        {
+            SV *tempsv;
+            tempsv = SvRV(_saved[0]);
+            sv_setiv(tempsv, (IV) *arg4);
+        }
         XSRETURN(argvi);
         fail:
         (void) _swigerr;
@@ -4086,14 +4105,16 @@ XS(_wrap_update_record) {
         ZebraHandle arg1 ;
         recordGroup *arg2 ;
         char *arg3 ;
-        int arg4 ;
+        int *arg4 ;
         char *arg5 ;
         char *arg6 ;
         char *arg7 ;
         int arg8 ;
         int arg9 ;
         int result;
+        int dvalue4 ;
         int argvi = 0;
+        SV * _saved[1] ;
         dXSARGS;
         
         if ((items < 9) || (items > 9)) {
@@ -4113,7 +4134,18 @@ XS(_wrap_update_record) {
         }
         if (!SvOK((SV*) ST(2))) arg3 = 0;
         else arg3 = (char *) SvPV(ST(2), PL_na);
-        arg4 = (int) SvIV(ST(3));
+        {
+            SV *tempsv;
+            if (!SvROK(ST(3))) {
+                SWIG_croak("expected a reference");
+            }
+            tempsv = SvRV(ST(3));
+            if (!SvIOK(tempsv)) {
+                SWIG_croak("expected a integer reference");
+            }
+            dvalue4 = SvIV(tempsv);
+            arg4 = &dvalue4;
+        }
         if (!SvOK((SV*) ST(4))) arg5 = 0;
         else arg5 = (char *) SvPV(ST(4), PL_na);
         if (!SvOK((SV*) ST(5))) arg6 = 0;
@@ -4122,10 +4154,16 @@ XS(_wrap_update_record) {
         else arg7 = (char *) SvPV(ST(6), PL_na);
         arg8 = (int) SvIV(ST(7));
         arg9 = (int) SvIV(ST(8));
+        _saved[0] = ST(3);
         result = (int)zebra_update_record(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,arg8,arg9);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
+        {
+            SV *tempsv;
+            tempsv = SvRV(_saved[0]);
+            sv_setiv(tempsv, (IV) *arg4);
+        }
         XSRETURN(argvi);
         fail:
         (void) _swigerr;
@@ -4141,14 +4179,16 @@ XS(_wrap_delete_record) {
         ZebraHandle arg1 ;
         recordGroup *arg2 ;
         char *arg3 ;
-        int arg4 ;
+        int *arg4 ;
         char *arg5 ;
         char *arg6 ;
         char *arg7 ;
         int arg8 ;
         int arg9 ;
         int result;
+        int dvalue4 ;
         int argvi = 0;
+        SV * _saved[1] ;
         dXSARGS;
         
         if ((items < 9) || (items > 9)) {
@@ -4168,7 +4208,18 @@ XS(_wrap_delete_record) {
         }
         if (!SvOK((SV*) ST(2))) arg3 = 0;
         else arg3 = (char *) SvPV(ST(2), PL_na);
-        arg4 = (int) SvIV(ST(3));
+        {
+            SV *tempsv;
+            if (!SvROK(ST(3))) {
+                SWIG_croak("expected a reference");
+            }
+            tempsv = SvRV(ST(3));
+            if (!SvIOK(tempsv)) {
+                SWIG_croak("expected a integer reference");
+            }
+            dvalue4 = SvIV(tempsv);
+            arg4 = &dvalue4;
+        }
         if (!SvOK((SV*) ST(4))) arg5 = 0;
         else arg5 = (char *) SvPV(ST(4), PL_na);
         if (!SvOK((SV*) ST(5))) arg6 = 0;
@@ -4177,10 +4228,16 @@ XS(_wrap_delete_record) {
         else arg7 = (char *) SvPV(ST(6), PL_na);
         arg8 = (int) SvIV(ST(7));
         arg9 = (int) SvIV(ST(8));
+        _saved[0] = ST(3);
         result = (int)zebra_delete_record(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,arg8,arg9);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
+        {
+            SV *tempsv;
+            tempsv = SvRV(_saved[0]);
+            sv_setiv(tempsv, (IV) *arg4);
+        }
         XSRETURN(argvi);
         fail:
         (void) _swigerr;
@@ -4194,16 +4251,17 @@ XS(_wrap_search_PQF) {
     const char *_swigerr = _swigmsg;
     {
         ZebraHandle arg1 ;
-        ODR arg2 ;
-        ODR arg3 ;
-        char *arg4 ;
-        char *arg5 ;
+        char *arg2 ;
+        char *arg3 ;
+        int *arg4 ;
         int result;
+        int dvalue4 ;
         int argvi = 0;
+        SV * _saved[1] ;
         dXSARGS;
         
-        if ((items < 5) || (items > 5)) {
-            SWIG_croak("Usage: search_PQF(zh,odr_input,odr_output,pqf_query,setname);");
+        if ((items < 4) || (items > 4)) {
+            SWIG_croak("Usage: search_PQF(zh,pqf_query,setname,hits);");
         }
         {
             ZebraHandle * argp;
@@ -4212,28 +4270,32 @@ XS(_wrap_search_PQF) {
             }
             arg1 = *argp;
         }
+        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);
         {
-            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");
+            SV *tempsv;
+            if (!SvROK(ST(3))) {
+                SWIG_croak("expected a reference");
             }
-            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");
+            tempsv = SvRV(ST(3));
+            if (!SvIOK(tempsv)) {
+                SWIG_croak("expected a integer reference");
             }
-            arg3 = *argp;
+            dvalue4 = SvIV(tempsv);
+            arg4 = &dvalue4;
         }
-        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);
+        _saved[0] = ST(3);
+        result = (int)zebra_search_PQF(arg1,(char const *)arg2,(char const *)arg3,arg4);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
+        {
+            SV *tempsv;
+            tempsv = SvRV(_saved[0]);
+            sv_setiv(tempsv, (IV) *arg4);
+        }
         XSRETURN(argvi);
         fail:
         (void) _swigerr;
@@ -4621,7 +4683,7 @@ XS(_wrap_sort) {
             }
             arg5[i] = NULL;
         }
-        result = (int)sort(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const **)arg5);
+        result = (int)zebra_sort_by_specstr(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const **)arg5);
         
         ST(argvi) = sv_newmortal();
         sv_setiv(ST(argvi++), (IV) result);
@@ -5296,11 +5358,9 @@ XS(_wrap_data1_nodetogr) {
             arg4 = *argp;
         }
         {
-            int i;
-            if (!SvIOK(ST(4))) 
-            croak("Argument 5 is not an integer.");
-            i = SvIV(ST(4));
-            arg5 = &i;
+            if (SWIG_ConvertPtr(ST(4), (void **) &arg5, SWIGTYPE_p_int,0) < 0) {
+                SWIG_croak("Type error in argument 5 of data1_nodetogr. Expected _p_int");
+            }
         }
         result = (Z_GenericRecord *)data1_nodetogr(arg1,arg2,arg3,arg4,arg5);
         
@@ -5418,11 +5478,9 @@ XS(_wrap_data1_nodetobuf) {
         }
         arg3 = (int) SvIV(ST(2));
         {
-            int i;
-            if (!SvIOK(ST(3))) 
-            croak("Argument 4 is not an integer.");
-            i = SvIV(ST(3));
-            arg4 = &i;
+            if (SWIG_ConvertPtr(ST(3), (void **) &arg4, SWIGTYPE_p_int,0) < 0) {
+                SWIG_croak("Type error in argument 4 of data1_nodetobuf. Expected _p_int");
+            }
         }
         result = (char *)data1_nodetobuf(arg1,arg2,arg3,arg4);
         
@@ -6994,11 +7052,9 @@ XS(_wrap_data1_nodetomarc) {
         }
         arg4 = (int) SvIV(ST(3));
         {
-            int i;
-            if (!SvIOK(ST(4))) 
-            croak("Argument 5 is not an integer.");
-            i = SvIV(ST(4));
-            arg5 = &i;
+            if (SWIG_ConvertPtr(ST(4), (void **) &arg5, SWIGTYPE_p_int,0) < 0) {
+                SWIG_croak("Type error in argument 5 of data1_nodetomarc. Expected _p_int");
+            }
         }
         result = (char *)data1_nodetomarc(arg1,arg2,arg3,arg4,arg5);
         
@@ -7045,11 +7101,9 @@ XS(_wrap_data1_nodetoidsgml) {
         }
         arg3 = (int) SvIV(ST(2));
         {
-            int i;
-            if (!SvIOK(ST(3))) 
-            croak("Argument 4 is not an integer.");
-            i = SvIV(ST(3));
-            arg4 = &i;
+            if (SWIG_ConvertPtr(ST(3), (void **) &arg4, SWIGTYPE_p_int,0) < 0) {
+                SWIG_croak("Type error in argument 4 of data1_nodetoidsgml. Expected _p_int");
+            }
         }
         result = (char *)data1_nodetoidsgml(arg1,arg2,arg3,arg4);
         
@@ -7190,11 +7244,9 @@ XS(_wrap_data1_nodetosoif) {
         }
         arg3 = (int) SvIV(ST(2));
         {
-            int i;
-            if (!SvIOK(ST(3))) 
-            croak("Argument 4 is not an integer.");
-            i = SvIV(ST(3));
-            arg4 = &i;
+            if (SWIG_ConvertPtr(ST(3), (void **) &arg4, SWIGTYPE_p_int,0) < 0) {
+                SWIG_croak("Type error in argument 4 of data1_nodetosoif. Expected _p_int");
+            }
         }
         result = (char *)data1_nodetosoif(arg1,arg2,arg3,arg4);