X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fscantest.c;h=45312ee4ee313c89fd5793486baab624a4af2a34;hp=706cb01f8667f34f3d605cee7fd72aa360b2047b;hb=732870c555c7d32c5d2b6a4914c6fa7232eb26b2;hpb=5ec9ca6ba57e794c245273637806d24a070f14f5 diff --git a/dict/scantest.c b/dict/scantest.c index 706cb01..45312ee 100644 --- a/dict/scantest.c +++ b/dict/scantest.c @@ -1,8 +1,5 @@ -/* $Id: scantest.c,v 1.8 2006-08-29 13:39:48 adam Exp $ - Copyright (C) 1995-2006 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -31,6 +31,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA struct handle_info { int b; int a; + int start_cut; + int end_cut; char **ar; }; @@ -43,48 +45,89 @@ static int handler(char *name, const char *info, int pos, void *client) else idx = -pos - 1; - yaz_log(YLOG_DEBUG, "pos=%d idx=%d name=%s", pos, idx, name); if (idx < 0) return 0; + if (idx < hi->start_cut || idx > hi->end_cut) + { + return 1; + } hi->ar[idx] = malloc(strlen(name)+1); strcpy(hi->ar[idx], name); + return 0; } -int do_scan(Dict dict, int before, int after, char *scan_term, char **cmp_strs, - int verbose) +int do_scan(Dict dict, int before, int after, const char *sterm, + char **cmp_strs, + int verbose, int start_cut, int end_cut) { struct handle_info hi; + char scan_term[1024]; + int i; int errors = 0; + + strcpy(scan_term, sterm); + hi.start_cut = start_cut; + hi.end_cut = end_cut; hi.a = after; hi.b = before; hi.ar = malloc(sizeof(char*) * (after+before+1)); - for (i = 0; i= start_cut && i <= end_cut) + { + if (!hi.ar[i]) + { + printf ("--> FAIL i=%d hi.ar[i] == NULL\n", i); + errors++; + } + } + else + { + if (hi.ar[i]) + { + printf ("--> FAIL i=%d hi.ar[i] = %s\n", i, hi.ar[i]); + errors++; + } + } + } + else { - if (!cmp_strs[i]) - { - printf ("--> FAIL cmp_strs == NULL\n"); - errors++; - } - else if (!hi.ar[i]) - { - printf ("--> FAIL strs == NULL\n"); - errors++; - } - else if (strcmp(cmp_strs[i], hi.ar[i])) - { - printf ("--> FAIL expected %s\n", cmp_strs[i]); - errors++; - } + if (i >= start_cut && i <= end_cut) + { + if (!hi.ar[i]) + { + printf ("--> FAIL i=%d strs == NULL\n", i); + errors++; + } + else if (!cmp_strs[i]) + { + printf ("--> FAIL i=%d cmp_strs == NULL\n", i); + errors++; + } + else if (strcmp(cmp_strs[i], hi.ar[i])) + { + printf ("--> FAIL i=%d expected %s\n", i, cmp_strs[i]); + errors++; + } + } + else + { + if (hi.ar[i]) + { + printf ("--> FAIL i=%d hi.ar[i] != NULL\n", i); + errors++; + } + } } if (verbose || errors) { @@ -108,7 +151,6 @@ int do_scan(Dict dict, int before, int after, char *scan_term, char **cmp_strs, static void tst(Dict dict, int start, int number) { int i; - char scan_term[1024]; /* insert again with original value again */ for (i = start; i < number; i += 100) @@ -118,7 +160,7 @@ static void tst(Dict dict, int start, int number) sprintf(w, "%d", i); YAZ_CHECK_EQ(dict_insert(dict, w, sizeof(v), &v), 2); } - /* insert again with differnt value */ + /* insert again with different value */ for (i = start; i < number; i += 100) { int v = i-1; @@ -135,25 +177,65 @@ static void tst(Dict dict, int start, int number) YAZ_CHECK_EQ(dict_insert(dict, w, sizeof(v), &v), 1); } +#if 1 { char *cs[] = { "4497", "4498", "4499", "45"}; - strcpy(scan_term, "4499"); - YAZ_CHECK_EQ(do_scan(dict, 2, 2, scan_term, cs, 0), 0); + YAZ_CHECK_EQ(do_scan(dict, 2, 2, "4499", cs, 0, 0, 3), 0); } +#endif +#if 1 { char *cs[] = { "4498", "4499", "45", "450"}; - strcpy(scan_term, "45"); - YAZ_CHECK_EQ(do_scan(dict, 2, 2, scan_term, cs, 0), 0); + YAZ_CHECK_EQ(do_scan(dict, 2, 2, "45", cs, 0, 0, 3), 0); + } +#endif +#if 1 + /* bug 4592 */ + { + char *cs[] = { + "4499", + "45", /* missing entry ! */ + "450", + "4500"}; + YAZ_CHECK_EQ(do_scan(dict, 4, 0, "4501", cs, 0, 0, 4), 0); + } +#endif +#if 1 + { + char *cs[] = { + "9996", + "9997", + "9998", + "9999"}; + YAZ_CHECK_EQ(do_scan(dict, 4, 0, "a", cs, 0, 0, 4), 0); + YAZ_CHECK_EQ(do_scan(dict, 3, 1, "9999", cs, 0, 0, 4), 0); + } +#endif +#if 1 + { + char *cs[] = { + "10", + "100", + "1000", + "1001" }; + YAZ_CHECK_EQ(do_scan(dict, 0, 4, "10", cs, 0, 0, 4), 0); + YAZ_CHECK_EQ(do_scan(dict, 0, 4, "1", cs, 0, 0, 4), 0); + YAZ_CHECK_EQ(do_scan(dict, 0, 4, " ", cs, 0, 0, 4), 0); + YAZ_CHECK_EQ(do_scan(dict, 0, 4, "", cs, 0, 0, 4), 0); } - +#endif +#if 1 + for (i = 0; i < 20; i++) + YAZ_CHECK_EQ(do_scan(dict, 20, 20, "45", 0, 0, 20-i, 20+i), 0); +#endif } int main(int argc, char **argv) @@ -202,7 +284,7 @@ int main(int argc, char **argv) if (bfs) { bf_reset(bfs); - dict = dict_open(bfs, "dict", 10, 1, 0, 0); + dict = dict_open(bfs, "dict", 100, 1, 0, 0); YAZ_CHECK(dict); } if (dict) @@ -217,7 +299,7 @@ int main(int argc, char **argv) } if (after > 0 || before > 0) - do_scan(dict, before, after, scan_term, 0, 1); + do_scan(dict, before, after, scan_term, 0, 1, 0, after+1); else tst(dict, start, number); @@ -230,6 +312,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab