null+****@clear*****
null+****@clear*****
2010年 8月 11日 (水) 18:24:27 JST
Kouhei Sutou 2010-08-11 09:24:27 +0000 (Wed, 11 Aug 2010)
New Revision: 50bd2e64114740654fcc5df98fbe226f3648b233
Log:
grn_geo_search() -> grn_geo_search_in_circle().
Modified files:
lib/expr.c
lib/geo.c
lib/geo.h
Modified: lib/expr.c (+2 -1)
===================================================================
--- lib/expr.c 2010-08-11 06:50:18 +0000 (7eadab8)
+++ lib/expr.c 2010-08-11 09:24:27 +0000 (f7b1fd5)
@@ -3986,7 +3986,8 @@ grn_table_select(grn_ctx *ctx, grn_obj *table, grn_obj *expr,
/* geo_in_circle only */
if (si->flags & SCAN_ACCESSOR) {
} else {
- grn_geo_search(ctx, index, si->args, si->nargs, res, si->logical_op);
+ grn_geo_search_in_circle(ctx, index, si->args, si->nargs, res,
+ si->logical_op);
done++;
}
break;
Modified: lib/geo.c (+2 -2)
===================================================================
--- lib/geo.c 2010-08-11 06:50:18 +0000 (c382bd3)
+++ lib/geo.c 2010-08-11 09:24:27 +0000 (b354237)
@@ -489,8 +489,8 @@ grn_geo_table_sort(grn_ctx *ctx, grn_obj *table, int offset, int limit,
}
grn_rc
-grn_geo_search(grn_ctx *ctx, grn_obj *obj, grn_obj **args, int nargs,
- grn_obj *res, grn_operator op)
+grn_geo_search_in_circle(grn_ctx *ctx, grn_obj *obj, grn_obj **args, int nargs,
+ grn_obj *res, grn_operator op)
{
grn_id domain;
double lng0, lat0, lng1, lat1, lng2, lat2, x, y, d;
Modified: lib/geo.h (+2 -2)
===================================================================
--- lib/geo.h 2010-08-11 06:50:18 +0000 (f7ae294)
+++ lib/geo.h 2010-08-11 09:24:27 +0000 (aa9f973)
@@ -45,8 +45,8 @@ extern "C" {
_longitude = GRN_GEO_INT2RAD(_val->longitude);\
} while (0)
-grn_rc grn_geo_search(grn_ctx *ctx, grn_obj *obj, grn_obj **args, int nargs,
- grn_obj *res, grn_operator op);
+grn_rc grn_geo_search_in_circle(grn_ctx *ctx, grn_obj *obj, grn_obj **args,
+ int nargs, grn_obj *res, grn_operator op);
int grn_geo_table_sort(grn_ctx *ctx, grn_obj *table, int offset, int limit,
grn_obj *result, grn_table_sort_key *keys, int n_keys);