v1.08

[simpleserver-moved-to-github.git] / SimpleServer.xs

diff --git a/SimpleServer.xs b/SimpleServer.xs
index f4f4356..94decda 100644 (file)
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.74 2007-08-20 15:36:13 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.77 2007-09-07 16:54:01 mike Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -824,6 +824,78 @@ int bend_search(void *handle, bend_search_rr *rr)
 }
 
 
+/* ### I am not 100% about the memory management in this handler */
+int bend_delete(void *handle, bend_delete_rr *rr)
+{
+       Zfront_handle *zhandle = (Zfront_handle *)handle;
+       HV *href;
+       CV* handler_cv;
+       int i;
+       SV **temp;
+       SV *point;
+
+       dSP;
+       ENTER;
+       SAVETMPS;
+
+       href = newHV();
+       hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
+       hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+       hv_store(href, "STATUS", 6, newSViv(0), 0);
+
+       PUSHMARK(sp);
+       XPUSHs(sv_2mortal(newRV( (SV*) href)));
+       PUTBACK;
+
+       handler_cv = simpleserver_sv2cv(delete_ref);
+
+       if (rr->function == 1) {
+           /* Delete all result sets in the session */
+           perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
+           temp = hv_fetch(href, "STATUS", 6, 1);
+           rr->delete_status = SvIV(*temp);
+       } else {
+           rr->delete_status = 0;
+           /*
+            * For some reason, deleting two or more result-sets in
+            * one operation goes horribly wrong, and ### I don't have
+            * time to debug it right now.
+            */
+           if (rr->num_setnames > 1) {
+               rr->delete_status = 3; /* "System problem at target" */
+               /* There's no way to sent delete-msg using the GFS */
+               return;
+           }
+
+           for (i = 0; i < rr->num_setnames; i++) {
+               hv_store(href, "SETNAME", 7, newSVpv(rr->setnames[i], 0), 0);
+               perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
+               temp = hv_fetch(href, "STATUS", 6, 1);
+               rr->statuses[i] = SvIV(*temp);
+               if (rr->statuses[i] != 0)
+                   rr->delete_status = rr->statuses[i];
+           }
+       }
+
+       SPAGAIN;
+
+       temp = hv_fetch(href, "HANDLE", 6, 1);
+       point = newSVsv(*temp);
+
+       hv_undef(href);
+
+       zhandle->handle = point;
+
+       sv_free( (SV*) href);   
+
+       PUTBACK;
+       FREETMPS;
+       LEAVE;
+
+       return 0;
+}
+
+
 int bend_fetch(void *handle, bend_fetch_rr *rr)
 {
        HV *href;
@@ -894,6 +966,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
                        else
                        {
                                rr->errcode = 26;
+                               rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
+                               return 0;
                        }
                }
                else if (composition->which == Z_RecordComp_complex)
@@ -912,8 +986,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
                        else
                        {
 #if 0  /* For now ignore this error, which is ubiquitous in SRU */
-                               fprintf(stderr, "complex is weird\n");
                                rr->errcode = 26;
+                               rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
                                return 0;
 #endif /*0*/
                        }
@@ -921,6 +995,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
                else
                {
                        rr->errcode = 26;
+                       rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
                        return 0;
                }
        }
@@ -1085,6 +1160,7 @@ int bend_present(void *handle, bend_present_rr *rr)
                        else
                        {
                                rr->errcode = 26;
+                               rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
                                return 0;
                        }
                }
@@ -1104,12 +1180,14 @@ int bend_present(void *handle, bend_present_rr *rr)
                        else
                        {
                                rr->errcode = 26;
+                               rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
                                return 0;
                        }
                }
                else
                {
                        rr->errcode = 26;
+                       rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
                        return 0;
                }
        }
@@ -1168,59 +1246,6 @@ int bend_esrequest(void *handle, bend_esrequest_rr *rr)
 }
 
 
-/* ### I am not 100% about the memory management in this handler */
-int bend_delete(void *handle, bend_delete_rr *rr)
-{
-       Zfront_handle *zhandle = (Zfront_handle *)handle;
-       HV *href;
-       CV* handler_cv;
-       int i;
-       SV **temp;
-
-       dSP;
-       ENTER;
-       SAVETMPS;
-
-       href = newHV();
-       hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
-       hv_store(href, "HANDLE", 6, zhandle->handle, 0);
-       hv_store(href, "STATUS", 6, newSViv(0), 0);
-
-       PUSHMARK(sp);
-       XPUSHs(sv_2mortal(newRV( (SV*) href)));
-       PUTBACK;
-
-       handler_cv = simpleserver_sv2cv(delete_ref);
-
-       if (rr->function == 1) {
-           /* Delete all result setss in the session */
-           perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
-           temp = hv_fetch(href, "STATUS", 6, 1);
-           rr->delete_status = SvIV(*temp);
-       } else {
-           rr->delete_status = 0;
-           for (i = 0; i < rr->num_setnames; i++) {
-               hv_store(href, "SETNAME", 7, newSVpv(rr->setnames[i], 0), 0);
-               perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
-               temp = hv_fetch(href, "STATUS", 6, 1);
-               rr->statuses[i] = SvIV(*temp);
-               if (rr->statuses[i] != 0)
-                   rr->delete_status = rr->statuses[i];
-           }
-       }
-
-       SPAGAIN;
-
-       sv_free( (SV*) href);   
-
-       PUTBACK;
-       FREETMPS;
-       LEAVE;
-
-       return 0;
-}
-
-
 int bend_scan(void *handle, bend_scan_rr *rr)
 {
         HV *href;