X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Ftrunc.c;h=0f9128e502903e22bc1603078e241be91c0a49ed;hb=81a75ae20b5b250309a70de51bfdf8de0019f882;hp=167c562ee5135953dd0f84dba817909d9046e526;hpb=0912d7cd382d578f045ef8f2cd1e092b3747d6e5;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index 167c562..0f9128e 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: trunc.c,v $ - * Revision 1.19 2001-01-16 16:56:15 heikki + * Revision 1.22 2002-04-05 08:46:26 adam + * Zebra with full functionality + * + * Revision 1.21 2002/04/04 14:14:13 adam + * Multiple registers (alpha early) + * + * Revision 1.20 2002/03/20 20:24:29 adam + * Hits per term. Returned in SearchResult-1 + * + * Revision 1.19 2001/01/16 16:56:15 heikki * Searching in my isam-d * * Revision 1.18 2000/05/18 12:01:36 adam @@ -73,18 +82,16 @@ #define NEW_TRUNC 1 -#include "zserver.h" +#include "index.h" #include #include #include -#if ZMBOL #include #include #include #if NEW_TRUNC #include #endif -#endif struct trunc_info { int *ptr; @@ -190,8 +197,9 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, RSFD result_rsfd; rset_temp_parms parms; + parms.cmp = key_compare_it; parms.key_size = sizeof(struct it_key); - parms.temp_path = res_get (zi->service->res, "setTmpDir"); + parms.temp_path = res_get (zi->res, "setTmpDir"); parms.rset_term = rset_term_create (term, length, flags); result = rset_create (rset_kind_temp, &parms); result_rsfd = rset_open (result, RSETF_WRITE); @@ -258,8 +266,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (rsfd); heap_close (ti); } -#if ZMBOL - else if (zi->service->isam) + else if (zi->reg->isam) { ISPT *ispt; int i; @@ -271,7 +278,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = is_position (zi->service->isam, isam_p[from+i]); + ispt[i] = is_position (zi->reg->isam, isam_p[from+i]); if (is_readkey (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -311,7 +318,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } - else if (zi->service->isamc) + else if (zi->reg->isamc) { ISAMC_PP *ispt; int i; @@ -323,7 +330,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isc_pp_open (zi->service->isamc, isam_p[from+i]); + ispt[i] = isc_pp_open (zi->reg->isamc, isam_p[from+i]); if (isc_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -364,7 +371,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (ispt); } - else if (zi->service->isamd) + else if (zi->reg->isamd) { ISAMD_PP *ispt; int i; @@ -376,7 +383,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isamd_pp_open (zi->service->isamd, isam_p[from+i]); + ispt[i] = isamd_pp_open (zi->reg->isamd, isam_p[from+i]); if (isamd_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -417,8 +424,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (ispt); } -#endif - else if (zi->service->isams) + else if (zi->reg->isams) { ISAMS_PP *ispt; int i; @@ -430,7 +436,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isams_pp_open (zi->service->isams, isam_p[from+i]); + ispt[i] = isams_pp_open (zi->reg->isams, isam_p[from+i]); if (isams_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -475,7 +481,6 @@ static int isams_trunc_cmp (const void *p1, const void *p2) return i1 - i2; } -#if ZMBOL static int isam_trunc_cmp (const void *p1, const void *p2) { ISAM_P i1 = *(ISAM_P*) p1; @@ -510,7 +515,6 @@ static int isamd_trunc_cmp (const void *p1, const void *p2) return d; return isamd_block (i1) - isamd_block (i2); } -#endif RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, const char *term, int length, const char *flags) @@ -522,41 +526,42 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_null, &parms); } - if (zi->service->isams) + if (zi->reg->isams) { if (no == 1) { rset_isams_parms parms; parms.pos = *isam_p; - parms.is = zi->service->isams; + parms.is = zi->reg->isams; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isams, &parms); } qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); } -#if ZMBOL - else if (zi->service->isam) + else if (zi->reg->isam) { if (no == 1) { rset_isam_parms parms; parms.pos = *isam_p; - parms.is = zi->service->isam; + parms.is = zi->reg->isam; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isam, &parms); } qsort (isam_p, no, sizeof(*isam_p), isam_trunc_cmp); } - else if (zi->service->isamc) + else if (zi->reg->isamc) { if (no == 1) { rset_isamc_parms parms; + parms.key_size = sizeof(struct it_key); + parms.cmp = key_compare_it; parms.pos = *isam_p; - parms.is = zi->service->isamc; + parms.is = zi->reg->isamc; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isamc, &parms); } @@ -567,7 +572,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, parms.key_size = sizeof(struct it_key); parms.cmp = key_compare_it; - parms.isc = zi->service->isamc; + parms.isc = zi->reg->isamc; parms.isam_positions = isam_p; parms.no_isam_positions = no; parms.no_save_positions = 100000; @@ -577,14 +582,14 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, #endif qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } - else if (zi->service->isamd) + else if (zi->reg->isamd) { if (no == 1) { rset_isamd_parms parms; parms.pos = *isam_p; - parms.is = zi->service->isamd; + parms.is = zi->reg->isamd; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isamd, &parms); } @@ -596,7 +601,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, parms.key_size = sizeof(struct it_key); parms.cmp = key_compare_it; parms.isc = 0; - parms.isamd=zi->service->isamd; + parms.isamd=zi->reg->isamd; parms.isam_positions = isam_p; parms.no_isam_positions = no; parms.no_save_positions = 100000; @@ -606,7 +611,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, #endif qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp); } -#endif else { logf (LOG_WARN, "Unknown isam set in rset_trunc");