-/* $Id: scan.c,v 1.16 2004-11-19 10:26:55 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: scan.c,v 1.23 2006-08-29 13:38:38 adam Exp $
+ Copyright (C) 1995-2006
+ Index Data ApS
This file is part of the Zebra server.
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 <stdio.h>
#include <assert.h>
-#include <dict.h>
+#include "dict-p.h"
-int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
- int start, int *count, void *client,
- int (*userfunc)(char *, const char *, int, void *),
- int dir)
+int dict_scan_trav(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
+ int start, int *count, void *client,
+ int (*userfunc)(char *, const char *, int, void *),
+ int dir)
{
int lo, hi, j;
void *p;
memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
str[pos] = dc;
memcpy (&subptr, info, sizeof(Dict_ptr));
- if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+ if (dir>0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
{
str[pos+1] = DICT_EOS;
if ((*userfunc)((char*) str,
return 1;
--(*count);
}
- if (*count > 0 && subptr)
+ if (*count>0 && subptr)
{
dict_scan_trav (dict, subptr, pos+1, str, -1, count,
client, userfunc, dir);
dict_bf_readp (dict->dbf, ptr, &p);
indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
+ if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+ {
+ str[pos+1] = DICT_EOS;
+ if ((*userfunc)((char*) str,
+ info+sizeof(Dict_ptr)+sizeof(Dict_char),
+ *count * dir, client))
+ return 1;
+ --(*count);
+ }
}
lo += dir;
}
}
}
if (*after && subptr)
- if (dict_scan_trav (dict, subptr, pos+1, str, -1,
- after, client, userfunc, 1))
+ if (dict_scan_trav(dict, subptr, pos+1, str, -1,
+ after, client, userfunc, 1))
return 1;
}
else if (subptr)
{
- if (dict_scan_r (dict, subptr, pos+1, str, before, after,
- client, userfunc))
+ if (dict_scan_r(dict, subptr, pos+1, str, before, after,
+ client, userfunc))
return 1;
}
break;
if (lo>hi && cmp < 0)
++mid;
if (*after)
- if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
- client, userfunc, 1))
+ if (dict_scan_trav(dict, ptr, pos, str, cmp ? mid : mid+1, after,
+ client, userfunc, 1))
return 1;
if (*before && mid > 0)
- if (dict_scan_trav (dict, ptr, pos, str, mid-1, before,
- client, userfunc, -1))
+ if (dict_scan_trav(dict, ptr, pos, str, mid-1, before,
+ client, userfunc, -1))
return 1;
return 0;
}
{
int i;
- yaz_log (YLOG_DEBUG, "dict_scan");
+ yaz_log(YLOG_DEBUG, "dict_scan");
for (i = 0; str[i]; i++)
{
- yaz_log (YLOG_DEBUG, " %3d %c", str[i],
- (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
+ yaz_log(YLOG_DEBUG, "start_term pos %d %3d %c", i, str[i],
+ (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
}
if (!dict->head.root)
return 0;
- return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
- before, after, client, f);
+ return dict_scan_r(dict, dict->head.root, 0, (Dict_char *) str,
+ before, after, client, f);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+