* Sebastian Hammer, Adam Dickmeiss
*
* $Log: scan.c,v $
- * Revision 1.2 1995-10-06 10:43:16 adam
+ * Revision 1.6 1995-11-20 11:58:04 adam
+ * Support for YAZ in standard located directories, such as /usr/local/..
+ *
+ * Revision 1.5 1995/10/09 16:18:32 adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.4 1995/10/06 13:52:00 adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.3 1995/10/06 11:06:07 adam
+ * Bug fixes.
+ *
+ * Revision 1.2 1995/10/06 10:43:16 adam
* Minor changes.
*
* Revision 1.1 1995/10/06 09:04:18 adam
#include <dict.h>
-void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
- int start, int *count,
- int (*userfunc)(Dict_char *, const char *, int pos),
+int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
+ int start, int *count, void *client,
+ int (*userfunc)(Dict_char *, const char *, int, void *),
int dir)
{
int lo, hi, j;
for (j = 0; info[j] != DICT_EOS; j++)
str[pos+j] = info[j];
str[pos+j] = DICT_EOS;
- (*userfunc)(str, info+j*sizeof(Dict_char), *count * dir);
+ if ((*userfunc)(str, info+(j+1)*sizeof(Dict_char), *count * dir,
+ client))
+ return 1;
--(*count);
}
else
if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
{
str[pos+1] = DICT_EOS;
- (*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
- *count * dir);
+ if ((*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
+ *count * dir, client))
+ return 1;
--(*count);
}
if (*count > 0 && subptr)
dict_scan_trav (dict, subptr, pos+1, str, 0, count,
- userfunc, dir);
+ client, userfunc, dir);
}
lo += dir;
}
+ return 0;
}
int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
- int *before, int *after,
- int (*userfunc)(Dict_char *, const char *, int))
+ int *before, int *after, void *client,
+ int (*userfunc)(Dict_char *, const char *, int, void *))
{
int cmp = 0, mid, lo, hi;
void *p;
char *info;
dict_bf_readp (dict->dbf, ptr, &p);
+ if (!p)
+ return 0;
mid = lo = 0;
hi = DICT_nodir(p)-1;
indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
cmp = dict_strcmp ((Dict_char*) info, str + pos);
if (!cmp)
{
- (*userfunc)(str, str, *after);
- --(*after);
+ if (*after)
+ {
+ (*userfunc)(str, info+
+ (dict_strlen(info)+1)*sizeof(Dict_char),
+ *after, client);
+ --(*after);
+ }
break;
}
}
{
if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
{
- (*userfunc)(str,
- info+sizeof(Dict_ptr)+sizeof(Dict_char),
- *after);
- --(*after);
+ if (*after)
+ {
+ (*userfunc)(str,
+ info+sizeof(Dict_ptr)+
+ sizeof(Dict_char),
+ *after, client);
+ --(*after);
+ }
}
- if (*after > 0 && subptr)
- dict_scan_trav (dict, subptr, pos+1, str, 0,
- after, userfunc, 1);
+ if (*after && subptr)
+ if (dict_scan_trav (dict, subptr, pos+1, str, 0,
+ after, client, userfunc, 1))
+ return 1;
}
- else if (*after > 0 && subptr)
- dict_scan_r (dict, subptr, pos+1, str, before, after,
- userfunc);
+ else if (subptr)
+ if (dict_scan_r (dict, subptr, pos+1, str, before, after,
+ client, userfunc))
+ return 1;
break;
}
}
if (lo>hi && cmp < 0)
++mid;
if (*after)
- dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
- userfunc, 1);
+ if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
+ client, userfunc, 1))
+ return 1;
if (*before && mid > 1)
- dict_scan_trav (dict, ptr, pos, str, mid-1, before,
- userfunc, -1);
+ if (dict_scan_trav (dict, ptr, pos, str, mid-1, before,
+ client, userfunc, -1))
+ return 1;
return 0;
}
int dict_scan (Dict dict, Dict_char *str, int *before, int *after,
- int (*f)(Dict_char *name, const char *info, int pos))
+ void *client,
+ int (*f)(Dict_char *name, const char *info, int pos,
+ void *client))
{
- int i;
- i = dict_scan_r (dict, 1, 0, str, before, after, f);
- return i;
+ return dict_scan_r (dict, 1, 0, str, before, after, client, f);
}