* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zrpn.c,v $
- * Revision 1.63 1997-09-17 12:19:18 adam
+ * Revision 1.67 1997-09-29 09:06:10 adam
+ * Removed one static var in order to make this module thread safe.
+ *
+ * Revision 1.66 1997/09/25 14:58:03 adam
+ * Windows NT port.
+ *
+ * Revision 1.65 1997/09/22 12:39:06 adam
+ * Added get_pos method for the ranked result sets.
+ *
+ * Revision 1.64 1997/09/18 08:59:20 adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.63 1997/09/17 12:19:18 adam
* Zebra version corresponds to YAZ version 1.4.
* Changed Zebra server so that it doesn't depend on global common_resource.
*
*/
#include <stdio.h>
#include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
+#endif
#include <ctype.h>
#include "zserver.h"
if (ct2 && strchr (ct2, *s0))
break;
s1 = s0;
- map = map_chrs_input (&s1, strlen(s1));
+ map = map_chrs_input (0, &s1, strlen(s1));
if (**map != *CHR_SPACE)
break;
s0 = s1;
while (*s0)
{
s1 = s0;
- map = map_chrs_input (&s0, strlen(s0));
+ map = map_chrs_input (0, &s0, strlen(s0));
if (space_split && **map == *CHR_SPACE)
break;
while (s1 < s0)
else
{
s1 = s0;
- map = map_chrs_input (&s0, strlen(s0));
+ map = map_chrs_input (0, &s0, strlen(s0));
if (space_split && **map == *CHR_SPACE)
break;
while (s1 < s0)
else
{
s1 = s0;
- map = map_chrs_input (&s0, strlen(s0));
+ map = map_chrs_input (0, &s0, strlen(s0));
if (**map == *CHR_SPACE)
break;
while (s1 < s0)
while ((len = (cp_end - cp)) > 0)
{
- map = map_chrs_input (&cp, len);
+ map = map_chrs_input (0, &cp, len);
if (**map == *CHR_SPACE)
space_map = *map;
else
parms.key_size = sizeof(struct it_key);
parms.max_rec = 1000;
parms.cmp = key_compare_it;
+ parms.get_pos = key_get_pos;
parms.is = zi->isam;
parms.isc = zi->isamc;
parms.no_terms = 0;
}
if (*zop->u.prox->proximityUnitCode != Z_ProxUnit_word)
{
- static char val[16];
+ char *val = odr_malloc (zi->odr, 16);
zi->errCode = 132;
zi->errString = val;
sprintf (val, "%d", *zop->u.prox->proximityUnitCode);
oident *attrset;
oid_value attributeSet;
- dict_grep_cmap (zi->dict, map_chrs_input);
+ dict_grep_cmap (zi->dict, 0, map_chrs_input);
zlog_rpn (rpn);
zi->errCode = 0;