X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=3de8ff6c296d4c321edf1818de50bcd4cc1a5754;hb=6dacbea766edc98899e9ad30f276da0809d9f4ef;hp=c342d7d8fd1d7058a368cd7ec5fe96fe85b7f23a;hpb=12c94e36b7e7e423a18d2a8395596859da8f5e9f;p=idzebra-moved-to-github.git diff --git a/index/retrieve.c b/index/retrieve.c index c342d7d..3de8ff6 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,5 +1,5 @@ -/* $Id: retrieve.c,v 1.38 2006-04-25 13:52:38 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: retrieve.c,v 1.43 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -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 @@ -145,7 +145,7 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, while(zebra_rec_keys_read(keys, &str, &slen, &key_in)) { int i; - int ord = key_in.mem[0]; + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); int index_type; const char *db = 0; int set = 0; @@ -153,9 +153,8 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, const char *string_index = 0; char dst_buf[IT_MAX_WORD]; - zebraExplain_lookup_ord (zh->reg->zei, ord, - &index_type, &db, - &set, &use, &string_index); + zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, + &string_index); if (string_index) wrbuf_printf(wrbuf, "%s", string_index); @@ -253,6 +252,7 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, } } retrieveCtrl.localno = sysno; + retrieveCtrl.staticrank = recordAttr->staticrank; retrieveCtrl.score = score; retrieveCtrl.recordSize = recordAttr->recordSize; retrieveCtrl.odr = stream; @@ -319,3 +319,11 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, *addinfo = retrieveCtrl.addinfo; return retrieveCtrl.diagnostic; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +