Kouhei Sutou
null+****@clear*****
Wed Dec 2 18:19:25 JST 2015
Kouhei Sutou 2015-12-02 18:19:25 +0900 (Wed, 02 Dec 2015) New Revision: c491a656bdab46708d086d2a1e4c291c0d714737 https://github.com/pgroonga/pgroonga/commit/c491a656bdab46708d086d2a1e4c291c0d714737 Message: Unify common code Modified files: pgroonga.c Modified: pgroonga.c (+20 -21) =================================================================== --- pgroonga.c 2015-12-02 18:08:38 +0900 (8a12b79) +++ pgroonga.c 2015-12-02 18:19:25 +0900 (3e67c52) @@ -1564,6 +1564,20 @@ PGrnCreateDataColumnsForJSON(PGrnCreateData *data) jsonTypesTable); } +#ifdef PGRN_SUPPORT_OPTIONS +static void +PGrnApplyOptionValues(PGrnOptions *options, + const char **tokenizerName, + const char **normalizerName) +{ + if (!options) + return; + + *tokenizerName = ((const char *) options) + options->tokenizerOffset; + *normalizerName = ((const char *) options) + options->normalizerOffset; +} +#endif + static void PGrnCreateFullTextSearchIndexColumnForJSON(PGrnCreateData *data) { @@ -1573,16 +1587,9 @@ PGrnCreateFullTextSearchIndexColumnForJSON(PGrnCreateData *data) grn_obj *lexicon; #ifdef PGRN_SUPPORT_OPTIONS - { - PGrnOptions *options; - options = (PGrnOptions *) (data->index->rd_options); - if (options) - { - tokenizerName = ((const char *) options) + options->tokenizerOffset; - normalizerName = - ((const char *) options) + options->normalizerOffset; - } - } + PGrnApplyOptionValues((PGrnOptions *) (data->index->rd_options), + &tokenizerName, + &normalizerName); #endif if (PGrnIsNoneValue(tokenizerName)) @@ -1733,17 +1740,9 @@ PGrnCreateIndexColumn(PGrnCreateData *data) } #ifdef PGRN_SUPPORT_OPTIONS - { - PGrnOptions *options; - options = (PGrnOptions *) (data->index->rd_options); - if (options) - { - tokenizerName = - ((const char *) options) + options->tokenizerOffset; - normalizerName = - ((const char *) options) + options->normalizerOffset; - } - } + PGrnApplyOptionValues((PGrnOptions *) (data->index->rd_options), + &tokenizerName, + &normalizerName); #endif if (!PGrnIsNoneValue(tokenizerName)) -------------- next part -------------- HTML����������������������������... Download