From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Dec 2009 10:23:22 +0000 (+0000)
Subject: Do not set hits member of bend_present_rr.
X-Git-Tag: CPAN.1.12~4
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=586fe28631368fca02c1c7bc29274f359e64396d;p=simpleserver-moved-to-github.git

Do not set hits member of bend_present_rr.

The hits member is not read at all by YAZ 3.0.X and is removed in
YAZ 4, so this should have no effect.
---

diff --git a/Makefile.PL b/Makefile.PL
index bec9442..a530000 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,10 +1,10 @@
 use ExtUtils::MakeMaker;
 
-## $Id: Makefile.PL,v 1.21 2008-09-02 15:11:48 mike Exp $
+## $Id: Makefile.PL,v 1.22 2009-12-29 10:23:22 adam Exp $
 
 # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement"
 
-my $yazconf = "yaz-config";
+my $yazconf = "../yaz/yaz-config";
 my $yazver = `$yazconf --version`;
 my $yazinc = `$yazconf --cflags servers`;
 my $yazlibs = `$yazconf --libs server`;
diff --git a/SimpleServer.xs b/SimpleServer.xs
index ab9b336..2abd8e4 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.84 2009-08-10 08:01:28 adam Exp $ 
+ * $Id: SimpleServer.xs,v 1.85 2009-12-29 10:23:22 adam Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -1119,7 +1119,6 @@ int bend_present(void *handle, bend_present_rr *rr)
 	SV **temp;
 	SV *err_code;
 	SV *err_string;
-	SV *hits;
 	SV *point;
 	STRLEN len;
 	Z_RecordComposition *composition;
@@ -1210,9 +1209,6 @@ int bend_present(void *handle, bend_present_rr *rr)
 	temp = hv_fetch(href, "ERR_STR", 7, 1);
 	err_string = newSVsv(*temp);
 
-	temp = hv_fetch(href, "HITS", 4, 1);
-	hits = newSVsv(*temp);
-
 	temp = hv_fetch(href, "HANDLE", 6, 1);
 	point = newSVsv(*temp);
 
@@ -1222,7 +1218,6 @@ int bend_present(void *handle, bend_present_rr *rr)
 	
 	hv_undef(href);
 	rr->errcode = SvIV(err_code);
-	rr->hits = SvIV(hits);
 
 	ptr = SvPV(err_string, len);
 	ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
@@ -1233,7 +1228,6 @@ int bend_present(void *handle, bend_present_rr *rr)
 	handle = zhandle;
 	sv_free(err_code);
 	sv_free(err_string);
-	sv_free(hits);
 	sv_free( (SV*) href);
 
 	return 0;