X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecgrs.c;h=c09f731f8f53b7b2d21b7a18f1f636191be12db1;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=8a31f3ce87d600ffa6a1e052a83c30a38204a9ba;hpb=c23dcf8e79596d2ae1fc05596e1d60ed318962e7;p=idzebra-moved-to-github.git diff --git a/index/recgrs.c b/index/recgrs.c index 8a31f3c..c09f731 100644 --- a/index/recgrs.c +++ b/index/recgrs.c @@ -1,4 +1,4 @@ -/* $Id: recgrs.c,v 1.3 2006-07-06 12:42:22 marc Exp $ +/* $Id: recgrs.c,v 1.5 2006-08-22 13:39:27 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -952,12 +952,7 @@ static int grs_extract_sub(void *clientData, struct recExtractCtrl *p, int oidtmp[OID_SIZE]; RecWord wrd; - gri.readf = p->readf; - gri.seekf = p->seekf; - gri.tellf = p->tellf; - gri.endf = p->endf; - gri.fh = p->fh; - gri.offset = p->offset; + gri.stream = p->stream; gri.mem = mem; gri.dh = p->dh; gri.clientData = clientData; @@ -1149,12 +1144,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, int dummy; mem = nmem_create(); - gri.readf = p->readf; - gri.seekf = p->seekf; - gri.tellf = p->tellf; - gri.endf = NULL; - gri.fh = p->fh; - gri.offset = 0; + gri.stream = p->stream; gri.mem = mem; gri.dh = p->dh; gri.clientData = clientData;