X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=3e50ae55ac941b3f196356f30fb76141b4098bd9;hb=b2084f54a96f78eede08dda6f98d5ee1f502e91b;hp=70d0da24fd976848c54978dcf8d63a7cde373478;hpb=ebc8a5296010dd0379bf7ae81b6c31145f8e85a7;p=idzebra-moved-to-github.git diff --git a/index/retrieve.c b/index/retrieve.c index 70d0da2..3e50ae5 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,4 +1,4 @@ -/* $Id: retrieve.c,v 1.77 2007-12-03 11:49:11 adam Exp $ +/* $Id: retrieve.c,v 1.79 2007-12-03 13:34:17 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -614,8 +614,7 @@ zint freq_term(ZebraHandle zh, int ord, const char *term, RSET rset_set) RSET rsets[2], rset; memcpy(&isam_p, info+1, sizeof(ISAM_P)); - rsets[0] = rsisamb_create(nmem, kc, - 2, zh->reg->isamb, isam_p, 0); + rsets[0] = zebra_create_rset_isam(zh, nmem, kc, kc->scope, isam_p, 0); rsets[1] = rset_dup(rset_set); rset = rset_create_and(nmem, kc, kc->scope, 2, rsets); @@ -778,7 +777,8 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname, i++, spec = spec->next) { int ord = CAST_ZINT_TO_INT(key_in.mem[0]); - if (ord == ord_array[i]) + if (ord == ord_array[i] && + str[0] != FIRST_IN_FIELD_CHAR) { int *freq; zebra_strmap_t sm = map_array[i]; @@ -839,7 +839,7 @@ static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname, *rec_bufp = odr_strdup(odr, wrbuf_cstr(wr)); wrbuf_destroy(wr); *rec_lenp = strlen(*rec_bufp); - *output_format = input_format; + *output_format = yaz_oid_recsyn_xml; xfree(pos_array); zebra_meta_records_destroy(zh, poset, num_recs);