X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.c;h=9756c5485aee4219a20208ddcd34825be60d51be;hp=6d6629ea390be5d832a015045c146b6d181aa9c9;hb=382b672ba466b8a986b8ffe4d9984df610763035;hpb=78d6e69ff8ed9dbe611e8e57eb11a477d5497eaa

diff --git a/SimpleServer.c b/SimpleServer.c
index 6d6629e..9756c54 100644
--- a/SimpleServer.c
+++ b/SimpleServer.c
@@ -34,7 +34,18 @@
  */
 
 /*$Log: SimpleServer.c,v $
-/*Revision 1.11  2001-08-24 14:00:20  sondberg
+/*Revision 1.13  2001-08-30 13:15:11  sondberg
+/*Corrected a memory leak, one more to go.
+/*
+/*Revision 1.10  2001/08/29 11:48:36  sondberg
+/*Added routines
+/*
+/*	Net::Z3950::SimpleServer::ScanSuccess
+/*	Net::Z3950::SimpleServer::ScanPartial
+/*
+/*and a bit of documentation.
+/*
+/*Revision 1.9  2001/08/24 14:00:20  sondberg
 /*Added support for scan.
 /*
 /*Revision 1.8  2001/05/21 11:07:02  sondberg
@@ -798,7 +809,6 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	int i;
 	char **basenames;
 	SV **temp;
-	SV *list_ref = sv_newmortal();
 	SV *err_code = sv_newmortal();
 	SV *err_str = sv_newmortal();
 	SV *point = sv_newmortal();
@@ -807,6 +817,8 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	char *ptr;
 	char *ODR_errstr;
 	STRLEN len;
+	int term_len;
+	SV *term_tmp;
 	
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 
@@ -817,7 +829,8 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	list = newAV();
 	if (rr->term->term->which == Z_Term_general)
 	{
-		hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, 0), 0);
+		term_len = rr->term->term->u.general->len;
+		hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0);
 	} else {
 		rr->errcode = 229;	/* Unsupported term type */
 		return 0;
@@ -864,8 +877,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	number = newSVsv(*temp);
 
 	temp = hv_fetch(href, "ENTRIES", 7, 1);
-	list_ref = newSVsv(*temp);
-	entries = (AV *)SvRV(list_ref);
+	entries = (AV *)SvRV(newSVsv(*temp));
 
 	PUTBACK;
 	FREETMPS;
@@ -882,7 +894,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	buffer = scan_list;
 	for (i = 0; i < rr->num_entries; i++)
 	{
-		scan_item = (HV *)SvRV(sv_2mortal(av_shift(entries)));
+		scan_item = (HV *)SvRV_noinc(sv_2mortal(av_shift(entries)));
 		temp = hv_fetch(scan_item, "TERM", 4, 1);
 		ptr = SvPV(*temp, len);
 		buffer->term = (char *) odr_malloc (rr->stream, len + 1); 
@@ -891,20 +903,23 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 		buffer->occurrences = SvIV(*temp);
 		buffer++;
 		hv_undef(scan_item);
+		/*sv_free((SV *)scan_item);*/
 	}
 	rr->entries = scan_list;
 	zhandle->handle = point;
 	handle = zhandle;
-	/*sv_free(list_ref);*/
 	sv_free(err_code);
 	sv_free(err_str);
 	sv_free(status);
 	sv_free(number);
-	/*sv_free(point);*/
 	hv_undef(href);
+	sv_free((SV *)href);
 	av_undef(aref);
+	sv_free((SV *)aref);
 	av_undef(list);
+	sv_free((SV *)list);
 	av_undef(entries);
+	sv_free((SV *)entries);
 
         return 0;
 }
@@ -1040,7 +1055,7 @@ void bend_close(void *handle)
 }
 
 
-#line 1041 "SimpleServer.c"
+#line 1056 "SimpleServer.c"
 XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 {
     dXSARGS;
@@ -1048,9 +1063,9 @@ XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_init_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1037 "SimpleServer.xs"
+#line 1052 "SimpleServer.xs"
 		init_ref = newSVsv(arg);
-#line 1051 "SimpleServer.c"
+#line 1066 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1062,9 +1077,9 @@ XS(XS_Net__Z3950__SimpleServer_set_close_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_close_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1044 "SimpleServer.xs"
+#line 1059 "SimpleServer.xs"
 		close_ref = newSVsv(arg);
-#line 1065 "SimpleServer.c"
+#line 1080 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1076,9 +1091,9 @@ XS(XS_Net__Z3950__SimpleServer_set_sort_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1051 "SimpleServer.xs"
+#line 1066 "SimpleServer.xs"
 		sort_ref = newSVsv(arg);
-#line 1079 "SimpleServer.c"
+#line 1094 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1090,9 +1105,9 @@ XS(XS_Net__Z3950__SimpleServer_set_search_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_search_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1057 "SimpleServer.xs"
+#line 1072 "SimpleServer.xs"
 		search_ref = newSVsv(arg);
-#line 1093 "SimpleServer.c"
+#line 1108 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1104,9 +1119,9 @@ XS(XS_Net__Z3950__SimpleServer_set_fetch_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1064 "SimpleServer.xs"
+#line 1079 "SimpleServer.xs"
 		fetch_ref = newSVsv(arg);
-#line 1107 "SimpleServer.c"
+#line 1122 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1118,9 +1133,9 @@ XS(XS_Net__Z3950__SimpleServer_set_present_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_present_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1071 "SimpleServer.xs"
+#line 1086 "SimpleServer.xs"
 		present_ref = newSVsv(arg);
-#line 1121 "SimpleServer.c"
+#line 1136 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1132,9 +1147,9 @@ XS(XS_Net__Z3950__SimpleServer_set_esrequest_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1078 "SimpleServer.xs"
+#line 1093 "SimpleServer.xs"
 		esrequest_ref = newSVsv(arg);
-#line 1135 "SimpleServer.c"
+#line 1150 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1146,9 +1161,9 @@ XS(XS_Net__Z3950__SimpleServer_set_delete_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1085 "SimpleServer.xs"
+#line 1100 "SimpleServer.xs"
 		delete_ref = newSVsv(arg);
-#line 1149 "SimpleServer.c"
+#line 1164 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1160,9 +1175,9 @@ XS(XS_Net__Z3950__SimpleServer_set_scan_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1092 "SimpleServer.xs"
+#line 1107 "SimpleServer.xs"
 		scan_ref = newSVsv(arg);
-#line 1163 "SimpleServer.c"
+#line 1178 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1171,15 +1186,15 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 {
     dXSARGS;
     {
-#line 1098 "SimpleServer.xs"
+#line 1113 "SimpleServer.xs"
 		char **argv;
 		char **argv_buf;
 		char *ptr;
 		int i;
 		STRLEN len;
-#line 1178 "SimpleServer.c"
+#line 1193 "SimpleServer.c"
 	int	RETVAL;
-#line 1104 "SimpleServer.xs"
+#line 1119 "SimpleServer.xs"
 		argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
 		argv = argv_buf;
 		for (i = 0; i < items; i++)
@@ -1191,7 +1206,39 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 		*argv_buf = NULL;
 
 		RETVAL = statserv_main(items, argv, bend_init, bend_close);
-#line 1192 "SimpleServer.c"
+#line 1207 "SimpleServer.c"
+	ST(0) = sv_newmortal();
+	sv_setiv(ST(0), (IV)RETVAL);
+    }
+    XSRETURN(1);
+}
+
+XS(XS_Net__Z3950__SimpleServer_ScanSuccess)
+{
+    dXSARGS;
+    if (items != 0)
+	croak("Usage: Net::Z3950::SimpleServer::ScanSuccess()");
+    {
+	int	RETVAL;
+#line 1137 "SimpleServer.xs"
+		RETVAL = BEND_SCAN_SUCCESS;
+#line 1223 "SimpleServer.c"
+	ST(0) = sv_newmortal();
+	sv_setiv(ST(0), (IV)RETVAL);
+    }
+    XSRETURN(1);
+}
+
+XS(XS_Net__Z3950__SimpleServer_ScanPartial)
+{
+    dXSARGS;
+    if (items != 0)
+	croak("Usage: Net::Z3950::SimpleServer::ScanPartial()");
+    {
+	int	RETVAL;
+#line 1144 "SimpleServer.xs"
+		RETVAL = BEND_SCAN_PARTIAL;
+#line 1239 "SimpleServer.c"
 	ST(0) = sv_newmortal();
 	sv_setiv(ST(0), (IV)RETVAL);
     }
@@ -1218,6 +1265,8 @@ XS(boot_Net__Z3950__SimpleServer)
         newXS("Net::Z3950::SimpleServer::set_delete_handler", XS_Net__Z3950__SimpleServer_set_delete_handler, file);
         newXS("Net::Z3950::SimpleServer::set_scan_handler", XS_Net__Z3950__SimpleServer_set_scan_handler, file);
         newXS("Net::Z3950::SimpleServer::start_server", XS_Net__Z3950__SimpleServer_start_server, file);
+        newXS("Net::Z3950::SimpleServer::ScanSuccess", XS_Net__Z3950__SimpleServer_ScanSuccess, file);
+        newXS("Net::Z3950::SimpleServer::ScanPartial", XS_Net__Z3950__SimpleServer_ScanPartial, file);
     XSRETURN_YES;
 }