X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=ca6f4b56f68df930fecc06f7c3a98e39a3a43e1c;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=e97e27c79f86208333f9a7cb93cba7ec82e5ce54;hpb=73bedd5ba9152c9c107b502fae65723b551aff09;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index e97e27c..ca6f4b5 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.137 2004-10-26 15:32:11 heikki Exp $
+/* $Id: zebraapi.c,v 1.139 2004-10-29 11:23:52 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -292,10 +292,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->ptr_i=0;
     
     zebraRankInstall (reg, rank1_class);
-#ifdef SKIPTHIS /* FIXME - those ranks not yet converted to new interface */
     zebraRankInstall (reg, rankzv_class);
-    zebraRankInstall (reg, rankliv_class);
-#endif
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -814,10 +811,6 @@ int zebra_search_RPN (ZebraHandle zh, ODR o,
     if (zebra_begin_read (zh))
 	return 1;
 
-#ifdef SKIPTHIS /* FIXME - livcode rank not yet available */
-    zebra_livcode_transform(zh, query);
-#endif
-
     resultSetAddRPN (zh, odr_extract_mem(o), query, 
                      zh->num_basenames, zh->basenames, setname);
 
@@ -900,6 +893,8 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 					&recs[i].len,
 					&recs[i].base);
 		recs[i].errString = NULL;
+                recs[i].score=poset[i].score;
+                recs[i].sysno=poset[i].sysno;
 	    }
 	    else
 	    {
@@ -1591,8 +1586,8 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 
 int zebra_end_trans (ZebraHandle zh)
 {
-    ASSERTZH;
     ZebraTransactionStatus dummy;
+    ASSERTZH;
     yaz_log(LOG_API,"zebra_end_trans");
     return zebra_end_transaction(zh, &dummy);
 }