null+****@clear*****
null+****@clear*****
2011年 10月 19日 (水) 22:06:28 JST
Kouhei Sutou 2011-10-19 13:06:28 +0000 (Wed, 19 Oct 2011)
New Revision: 57fed1e16783b8a47100ffcbf97b5d1a730253fb
Log:
GRN_CURSOR_GEO -> GRN_CURSOR_COLUMN_GEO_INDEX.
Modified files:
include/groonga.h
lib/db.c
lib/geo.c
Modified: include/groonga.h (+1 -1)
===================================================================
--- include/groonga.h 2011-10-19 12:48:32 +0000 (60c0b60)
+++ include/groonga.h 2011-10-19 13:06:28 +0000 (38807ad)
@@ -419,7 +419,7 @@ typedef unsigned short int grn_obj_flags;
#define GRN_CURSOR_TABLE_NO_KEY (0x13)
#define GRN_CURSOR_TABLE_VIEW (0x14)
#define GRN_CURSOR_COLUMN_INDEX (0x18)
-#define GRN_CURSOR_GEO (0x1a)
+#define GRN_CURSOR_COLUMN_GEO_INDEX (0x1a)
#define GRN_TYPE (0x20)
#define GRN_PROC (0x21)
#define GRN_EXPR (0x22)
Modified: lib/db.c (+1 -1)
===================================================================
--- lib/db.c 2011-10-19 12:48:32 +0000 (ce93a5b)
+++ lib/db.c 2011-10-19 13:06:28 +0000 (c1ef21e)
@@ -6373,7 +6373,7 @@ grn_obj_close(grn_ctx *ctx, grn_obj *obj)
GRN_FREE(ic);
}
break;
- case GRN_CURSOR_GEO :
+ case GRN_CURSOR_COLUMN_GEO_INDEX :
grn_geo_cursor_close(ctx, obj);
break;
case GRN_TYPE :
Modified: lib/geo.c (+1 -1)
===================================================================
--- lib/geo.c 2011-10-19 12:48:32 +0000 (9d15352)
+++ lib/geo.c 2011-10-19 13:06:28 +0000 (6c320b1)
@@ -934,7 +934,7 @@ grn_geo_cursor_open_in_rectangle(grn_ctx *ctx,
goto exit;
}
- cursor->obj.header.type = GRN_CURSOR_GEO;
+ cursor->obj.header.type = GRN_CURSOR_COLUMN_GEO_INDEX;
cursor->obj.header.impl_flags = GRN_OBJ_ALLOCATED;
cursor->obj.header.flags = 0;
cursor->obj.header.domain = GRN_ID_NIL;