X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=ZOOM.xs;h=16394141ee3714dba5562e1a291d35dc7ae87686;hb=5909129b2f0dda765dfbf1de46a2f9b7e179a04d;hp=557e4eddf133c3df3573ea49e04c6d75d667e063;hpb=c79aab4ce5b9a90f8bd3ff1f6873b4023f41f600;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 557e4ed..1639414 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.20 2005-11-02 18:23:10 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.22 2005-11-03 16:23:36 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -250,40 +250,29 @@ size_t
 ZOOM_resultset_size(r)
 	ZOOM_resultset r
 
-# TESTING
+# TESTED
 SV *
-ZOOM_resultset_records(r, start, count, return_values)
+ZOOM_resultset_records(r, start, count, return_records)
 	ZOOM_resultset r
 	size_t start
 	size_t count
-	int return_values
+	int return_records
 	INIT:
-		ZOOM_record *recs;
+		ZOOM_record *recs = 0;
 	CODE:
-		/*printf("*** ZOOM_resultset_records(r=0x%lx, start=%lu, count=%lx, return_values=%d)\n", (unsigned long) r, (unsigned long) start, (unsigned long) count, return_values);*/
-		if (return_values) {
-			/*printf("*** generating space for %ld records\n", (unsigned long) count);*/
+		if (return_records)
 			recs = (ZOOM_record*) xmalloc(count * sizeof *recs);
-		} else {
-			/*printf("*** using null pointer for records array\n");*/
-			recs = 0;
-		}
 		ZOOM_resultset_records(r, recs, start, count);
-		/*printf("*** returned from ZOOM_resultset_records()\n");*/
-		if (return_values) {
+		if (return_records) {
 			AV *av = newAV();
 			int i;
 			for (i = 0; i < count; i++) {
-				SV *tmp = sv_newmortal();
-				printf("*** recs[%d] = %lu\n", i, (unsigned long) recs[i]);
-				/* ### Next line fails.  Damn and blast Perl */
+				SV *tmp = newSV(0);
 				sv_setref_pv(tmp, "ZOOM_record", (void*) recs[i]);
 				av_push(av, tmp);
 			}
 			RETVAL = newRV((SV*) av);
-			printf("*** returning array %lu\n", (unsigned long) RETVAL);
 		} else {
-			/*printf("*** returning undef\n");*/
 			RETVAL = &PL_sv_undef;
 		}
 	OUTPUT: