* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zebramap.c,v $
- * Revision 1.12 1999-02-12 13:29:25 adam
+ * Revision 1.15 1999-05-26 07:49:14 adam
+ * C++ compilation.
+ *
+ * Revision 1.14 1999/02/19 10:37:40 adam
+ * Minor fix.
+ *
+ * Revision 1.13 1999/02/18 15:01:04 adam
+ * Structure=key uses register type 0.
+ *
+ * Revision 1.12 1999/02/12 13:29:25 adam
* Implemented position-flag for registers.
*
* Revision 1.11 1998/10/13 20:09:19 adam
zm = &zms->map_list;
else
zm = &(*zm)->next;
- *zm = nmem_malloc (zms->nmem, sizeof(**zm));
+ *zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(**zm));
(*zm)->reg_id = argv[1][0];
(*zm)->maptab_name = NULL;
(*zm)->maptab = NULL;
zm = &zms->map_list;
else
zm = &(*zm)->next;
- *zm = nmem_malloc (zms->nmem, sizeof(**zm));
+ *zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(**zm));
(*zm)->reg_id = argv[1][0];
(*zm)->maptab_name = NULL;
(*zm)->type = ZEBRA_MAP_TYPE_SORT;
static void zms_map_handle (void *p, const char *name, const char *value)
{
- ZebraMaps zms = p;
+ ZebraMaps zms = (ZebraMaps) p;
zebra_map_read (zms, value);
}
ZebraMaps zebra_maps_open (Res res)
{
- ZebraMaps zms = xmalloc (sizeof(*zms));
+ ZebraMaps zms = (ZebraMaps) xmalloc (sizeof(*zms));
int i;
zms->nmem = nmem_create ();
- zms->tabpath = nmem_strdup (zms->nmem, res_get (res, "profilePath"));
+ zms->tabpath = nmem_strdup (zms->nmem, res_get_def (res, "profilePath", "."));
zms->map_list = NULL;
zms->temp_map_str[0] = '\0';
zms->temp_map_ptr[0] = zms->temp_map_str;
zms->temp_map_ptr[1] = NULL;
- zms->lookup_array =
+ zms->lookup_array = (struct zebra_map**)
nmem_malloc (zms->nmem, sizeof(*zms->lookup_array)*256);
for (i = 0; i<256; i++)
zms->lookup_array[i] = 0;
struct zebra_map *zm = zebra_map_get (zms, reg_id);
if (!zm)
{
- zm = nmem_malloc (zms->nmem, sizeof(*zm));
+ zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm));
logf (LOG_WARN, "Unknown register type: %c", reg_id);
zm->reg_id = reg_id;
case -1:
case 1: /* phrase */
case 2: /* word */
- case 3: /* key */
case 108: /* string */
*search_type = "phrase";
break;
*reg_id = 'u';
*search_type = "phrase";
break;
+ case 3: /* key */
+ *reg_id = '0';
+ *search_type = "phrase";
+ break;
default:
return -1;
}