Kouhei Sutou
null+****@clear*****
Wed Jan 18 16:55:07 JST 2017
Kouhei Sutou 2017-01-18 16:55:07 +0900 (Wed, 18 Jan 2017) New Revision: ba6cbbb55147fc7ca515abbd77beba6c8398dbf9 https://github.com/groonga/groonga/commit/ba6cbbb55147fc7ca515abbd77beba6c8398dbf9 Message: doc: update Modified files: doc/locale/ja/LC_MESSAGES/reference.po doc/source/reference/functions/query.rst doc/source/reference/grn_expr/script_syntax.rst Modified: doc/locale/ja/LC_MESSAGES/reference.po (+142 -158) =================================================================== --- doc/locale/ja/LC_MESSAGES/reference.po 2017-01-18 16:41:15 +0900 (2335fe4) +++ doc/locale/ja/LC_MESSAGES/reference.po 2017-01-18 16:55:07 +0900 (ebace0b) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.1\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2016-12-07 19:42+0900\n" +"PO-Revision-Date: 2017-01-18 16:54+0900\n" "Last-Translator: Masafumi Yokoyama <yokoyama �� clear-code.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -7268,26 +7268,32 @@ msgstr "" "``logical_select`` には高度なドリルダウン機能のために以下の名前付き引数があり" "ます。" -msgid "``drilldown[${LABEL}].keys=null``" +msgid "``drilldowns[${LABEL}].keys=null``" +msgstr "" + +msgid "``drilldowns[${LABEL}].sortby=null``" msgstr "" -msgid "``drilldown[${LABEL}].sortby=null``" +msgid "``drilldowns[${LABEL}].output_columns=\"_key, _nsubrecs\"``" msgstr "" -msgid "``drilldown[${LABEL}].output_columns=\"_key, _nsubrecs\"``" +msgid "``drilldowns[${LABEL}].offset=0``" msgstr "" -msgid "``drilldown[${LABEL}].offset=0``" +msgid "``drilldowns[${LABEL}].limit=10``" msgstr "" -msgid "``drilldown[${LABEL}].limit=10``" +msgid "``drilldowns[${LABEL}].calc_types=NONE``" msgstr "" -msgid "``drilldown[${LABEL}].calc_types=NONE``" +msgid "``drilldowns[${LABEL}].calc_target=null``" msgstr "" -msgid "``drilldown[${LABEL}].calc_target=null``" +msgid "" +"``drilldown[...]`` syntax is deprecated, Use ``drilldowns[...]`` instead." msgstr "" +"``drilldown[...]`` 構文は非推奨になりました。代わりに ``drilldowns[...]`` を" +"使用してください。" msgid "" "You can use one or more alphabets, digits, ``_`` and ``.`` for ``${LABEL}``. " @@ -7302,25 +7308,25 @@ msgstr "同じ ``${LABEL}`` も持つ引数は同じグループになります msgid "For example, the following parameters specify one drilldown:" msgstr "たとえば、以下の引数は1つのドリルダウンを指定しています。" -msgid "``--drilldown[label].keys column``" +msgid "``--drilldowns[label].keys column``" msgstr "" -msgid "``--drilldown[label].sortby -_nsubrecs``" +msgid "``--drilldowns[label].sortby -_nsubrecs``" msgstr "" msgid "The following parameters specify two drilldowns:" msgstr "以下の引数は2つのドリルダウンを指定しています。" -msgid "``--drilldown[label1].keys column1``" +msgid "``--drilldowns[label1].keys column1``" msgstr "" -msgid "``--drilldown[label1].sortby -_nsubrecs``" +msgid "``--drilldowns[label1].sortby -_nsubrecs``" msgstr "" -msgid "``--drilldown[label2].keys column2``" +msgid "``--drilldowns[label2].keys column2``" msgstr "" -msgid "``--drilldown[label2].sortby _key``" +msgid "``--drilldowns[label2].sortby _key``" msgstr "" msgid "Differences from ``select``" @@ -7351,11 +7357,11 @@ msgstr "" "ドのみを使った場合はサポートしています。）" msgid "" -"``_value.${KEY_NAME}`` in ``drilldown[${LABEL}].sortby`` doesn't work with " -"multiple shards. It works with one shard. ``_key`` in ``drilldown[${LABEL}]." +"``_value.${KEY_NAME}`` in ``drilldowns[${LABEL}].sortby`` doesn't work with " +"multiple shards. It works with one shard. ``_key`` in ``drilldowns[${LABEL}]." "sortby`` work with multiple shards." msgstr "" -"複数のシャードを使った場合、 ``drilldown[${LABEL}].sortby`` の中で ``_value." +"複数のシャードを使った場合、 ``drilldowns[${LABEL}].sortby`` の中で ``_value." "${KEY_NAME}`` を使えません。1つのシャードのみを使った場合は使えます。" msgid "``match_columns`` and ``query`` aren't supported yet." @@ -7722,27 +7728,27 @@ msgstr "" msgid "There are some limitations:" msgstr "いくつか制限があります。" -msgid "``drilldown[${LABEL}].keys``" +msgid "``drilldowns[${LABEL}].keys``" msgstr "" msgid "" -"Corresponds to :ref:`select-drilldown-label-keys` in :doc:`select`. See :ref:" -"`select-drilldown-label-keys` for details." +"Corresponds to :ref:`select-drilldowns-label-keys` in :doc:`select`. See :" +"ref:`select-drilldowns-label-keys` for details." msgstr "" -":doc:`select` の :ref:`select-drilldown-label-keys` に対応しています。詳細" -"は :ref:`select-drilldown-label-keys` を見てください。" +":doc:`select` の :ref:`select-drilldowns-label-keys` に対応しています。詳細" +"は :ref:`select-drilldowns-label-keys` を見てください。" -msgid "``drilldown[${LABEL}].output_columns``" +msgid "``drilldowns[${LABEL}].output_columns``" msgstr "" msgid "" -"Corresponds to :ref:`select-drilldown-label-output-columns` in :doc:" -"`select`. See :ref:`select-drilldown-label-output-columns` for details." +"Corresponds to :ref:`select-drilldowns-label-output-columns` in :doc:" +"`select`. See :ref:`select-drilldowns-label-output-columns` for details." msgstr "" -":doc:`select` の :ref:`select-drilldown-label-output-columns` に対応していま" -"す。詳細は :ref:`select-drilldown-label-output-columns` を見てください。" +":doc:`select` の :ref:`select-drilldowns-label-output-columns` に対応していま" +"す。詳細は :ref:`select-drilldowns-label-output-columns` を見てください。" -msgid "``drilldown[${LABEL}].sortby``" +msgid "``drilldowns[${LABEL}].sortby``" msgstr "" msgid "" @@ -7752,14 +7758,14 @@ msgstr "" "ラベルなしドリルダウンの :ref:`logical-select-drilldown-sortby` に対応してい" "ます。" -msgid "``drilldown[${LABEL}].sortby`` has a limitation." -msgstr "``drilldown[${LABEL}].sortby`` には制限があります。" +msgid "``drilldowns[${LABEL}].sortby`` has a limitation." +msgstr "``drilldowns[${LABEL}].sortby`` には制限があります。" msgid "" "Here is an example that uses ``_value.${KEY_NAME}`` with only one shard:" msgstr "以下は1つのシャードに対して ``_value.${KEY_NAME}`` を使う例です。" -msgid "``drilldown[${LABEL}].offset``" +msgid "``drilldowns[${LABEL}].offset``" msgstr "" msgid "" @@ -7769,7 +7775,7 @@ msgstr "" "ラベルなしドリルダウンの :ref:`logical-select-drilldown-offset` に対応してい" "ます。" -msgid "``drilldown[${LABEL}].limit``" +msgid "``drilldowns[${LABEL}].limit``" msgstr "" msgid "" @@ -7779,7 +7785,7 @@ msgstr "" "ラベルなしドリルダウンの :ref:`logical-select-drilldown-limit` に対応していま" "す。" -msgid "``drilldown[${LABEL}].calc_types``" +msgid "``drilldowns[${LABEL}].calc_types``" msgstr "" msgid "" @@ -7789,7 +7795,7 @@ msgstr "" "ラベルなしドリルダウンの :ref:`logical-select-drilldown-calc-types` に対応し" "ています。" -msgid "``drilldown[${LABEL}].calc_target``" +msgid "``drilldowns[${LABEL}].calc_target``" msgstr "" msgid "" @@ -7800,9 +7806,9 @@ msgstr "" "ています。" msgid "" -"See also :ref:`logical-select-drilldown-label-calc-types` for an example." +"See also :ref:`logical-select-drilldowns-label-calc-types` for an example." msgstr "" -"例は :ref:`logical-select-drilldown-label-calc-types` を参照してください。" +"例は :ref:`logical-select-drilldowns-label-calc-types` を参照してください。" msgid "" "The return value format of ``logical_select`` is compatible with :doc:" @@ -10453,51 +10459,6 @@ msgid "``select`` has the following named parameters for advanced drilldown:" msgstr "" "``select`` には高度なドリルダウン機能のために以下の名前付き引数があります。" -msgid "``drilldowns[${LABEL}].keys=null``" -msgstr "" - -msgid "``drilldowns[${LABEL}].sortby=null``" -msgstr "" - -msgid "``drilldowns[${LABEL}].output_columns=\"_key, _nsubrecs\"``" -msgstr "" - -msgid "``drilldowns[${LABEL}].offset=0``" -msgstr "" - -msgid "``drilldowns[${LABEL}].limit=10``" -msgstr "" - -msgid "``drilldowns[${LABEL}].calc_types=NONE``" -msgstr "" - -msgid "``drilldowns[${LABEL}].calc_target=null``" -msgstr "" - -msgid "" -"``drilldown[...]`` syntax is deprecated, Use ``drilldowns[...]`` instead." -msgstr "" -"``drilldown[...]`` 構文は非推奨になりました。代わりに ``drilldowns[...]`` を" -"使用してください。" - -msgid "``--drilldowns[label].keys column``" -msgstr "" - -msgid "``--drilldowns[label].sortby -_nsubrecs``" -msgstr "" - -msgid "``--drilldowns[label1].keys column1``" -msgstr "" - -msgid "``--drilldowns[label1].sortby -_nsubrecs``" -msgstr "" - -msgid "``--drilldowns[label2].keys column2``" -msgstr "" - -msgid "``--drilldowns[label2].sortby _key``" -msgstr "" - msgid "" "Let's learn about ``select`` usage with examples. This section shows many " "popular usages." @@ -12009,27 +11970,6 @@ msgid "" msgstr "" "以下の引数を使うことで、各ドリルダウンで別々の設定を使うことができます。" -msgid "``drilldowns[${LABEL}].keys``" -msgstr "" - -msgid "``drilldowns[${LABEL}].sortby``" -msgstr "" - -msgid "``drilldowns[${LABEL}].output_columns``" -msgstr "" - -msgid "``drilldowns[${LABEL}].offset``" -msgstr "" - -msgid "``drilldowns[${LABEL}].limit``" -msgstr "" - -msgid "``drilldowns[${LABEL}].calc_types``" -msgstr "" - -msgid "``drilldowns[${LABEL}].calc_target``" -msgstr "" - msgid "" "``${LABEL}`` is a variable. You can use the following characters for ``" "${LABEL}``:" @@ -12155,12 +12095,12 @@ msgstr "" msgid "" "``tag.n_likes`` is used as the label for the drilldown parameters group. You " "can refer grouped keys by ``_value.${KEY_NAME}`` syntax in :ref:`select-" -"drilldown-label-output-columns`. ``${KEY_NAME}`` is a column name to be used " -"by group key. ``tag`` and ``n_likes`` are ``${KEY_NAME}`` in this case." +"drilldowns-label-output-columns`. ``${KEY_NAME}`` is a column name to be " +"used by group key. ``tag`` and ``n_likes`` are ``${KEY_NAME}`` in this case." msgstr "" "``tag.n_likes`` はドリルダウン引数グループのラベルです。グループ化に使ったそ" -"れぞれのキーを参照するときは :ref:`select-drilldown-label-output-columns` で " -"``_value.${KEY_NAME}`` という構文を使います。 ``${KEY_NAME}`` にはグループ" +"れぞれのキーを参照するときは :ref:`select-drilldowns-label-output-columns` " +"で ``_value.${KEY_NAME}`` という構文を使います。 ``${KEY_NAME}`` にはグループ" "キーを指定したときに使ったカラム名を使います。この場合は ``${KEY_NAME}`` に " "``tag`` と ``n_keys`` を使います。" @@ -12188,11 +12128,11 @@ msgid "" ":ref:`select-drilldown-output-columns` uses ``_key`` :doc:`/reference/" "columns/pseudo` to refer group key. ``drilldowns[${LABEL}].output_columns`` " "also uses ``_key`` :doc:`/reference/columns/pseudo` to refer group key when " -"you specify only one group key by :ref:`select-drilldown-label-keys`." +"you specify only one group key by :ref:`select-drilldowns-label-keys`." msgstr "" ":ref:`select-drilldown-output-columns` はグループキーを参照するために " "``_key`` :doc:`/reference/columns/pseudo` を使います。 " -"``drilldowns[${LABEL}].output_columns`` も :ref:`select-drilldown-label-" +"``drilldowns[${LABEL}].output_columns`` も :ref:`select-drilldowns-label-" "keys` で1つだけしかグループキーを指定していない場合は、グループキーを参照する" "ために ``_key`` :doc:`/reference/columns/pseudo` を使います。" @@ -12207,11 +12147,11 @@ msgid "" "But you can't refer each group key by ``_key`` :doc:`/reference/columns/" "pseudo` in ``drilldowns[${LABEL}].output_columns``. You need to use ``_value." "${KEY_NAME}`` syntax. ``${KEY_NAME}`` is a column name that is used for " -"group key in :ref:`select-drilldown-label-keys`." +"group key in :ref:`select-drilldowns-label-keys`." msgstr "" -"``drilldowns[${LABEL}].output_columns`` で各グループキーを参照するために " +"``drilldownss[${LABEL}].output_columns`` で各グループキーを参照するために " "``_key`` :doc:`/reference/columns/pseudo` を使うことはできません。 ``_value." -"${KEY_NAME}`` 構文を使います。 ``${KEY_NAME}`` には :ref:`select-drilldown-" +"${KEY_NAME}`` 構文を使います。 ``${KEY_NAME}`` には :ref:`select-drilldowns-" "label-keys` でグループキーを指定するために使ったカラム名を使います。" msgid "" @@ -12238,21 +12178,21 @@ msgstr "" msgid "" "There is one grouped record in ``_value`` to refer each grouped values when " -"you specify multiple group keys to :ref:`select-drilldown-label-keys`. So " +"you specify multiple group keys to :ref:`select-drilldowns-label-keys`. So " "you can refer each group key by ``_value.${KEY_NAME}`` syntax." msgstr "" -":ref:`select-drilldown-label-keys` に複数のグループキーを指定したとき、各グ" +":ref:`select-drilldowns-label-keys` に複数のグループキーを指定したとき、各グ" "ループの値を参照するために ``_value`` にグループのレコードが1つだけ保存されて" "います。そのため、各グループキーを参照するために ``_value.${KEY_NAME}`` 構文" "を使えます。" msgid "" "On the other hand, there is no grouped record in ``_value`` when you specify " -"only one group key to :ref:`select-drilldown-label-keys`. So you can't refer " -"group key by ``_value.${KEY_NAME}`` syntax." +"only one group key to :ref:`select-drilldowns-label-keys`. So you can't " +"refer group key by ``_value.${KEY_NAME}`` syntax." msgstr "" -"一方、 :ref:`select-drilldown-label-keys` に1つのグループキーしか指定していな" -"い場合は、 ``_value`` にグループのレコードを保存しません。そのため、 " +"一方、 :ref:`select-drilldowns-label-keys` に1つのグループキーしか指定してい" +"ない場合は、 ``_value`` にグループのレコードを保存しません。そのため、 " "``_value.${KEY_NAME}`` 構文でグループキーを参照できません。" msgid "Output format for ``drilldowns[${LABEL}]`` style" @@ -12260,21 +12200,21 @@ msgstr "``drilldowns[${LABEL}]`` スタイルの出力フォーマット" msgid "" "There is a difference in output format between :ref:`select-drilldown` and :" -"ref:`select-drilldown-label-keys`. :ref:`select-drilldown` uses array to " -"output multiple drilldown results. :ref:`select-drilldown-label-keys` uses " +"ref:`select-drilldowns-label-keys`. :ref:`select-drilldown` uses array to " +"output multiple drilldown results. :ref:`select-drilldowns-label-keys` uses " "pairs of label and drilldown result." msgstr "" -":ref:`select-drilldown` と :ref:`select-drilldown-label-keys` には出力フォー" +":ref:`select-drilldown` と :ref:`select-drilldowns-label-keys` には出力フォー" "マットに違いがあります。 :ref:`select-drilldown` は複数のドリルダウン結果を出" -"力するために配列を使います。 :ref:`select-drilldown-label-keys` は「ラベル」" +"力するために配列を使います。 :ref:`select-drilldowns-label-keys` は「ラベル」" "と「ドリルダウン結果」のペアの集まりを使います。" msgid ":ref:`select-drilldown` uses the following output format::" msgstr ":ref:`select-drilldown` の出力フォーマットは以下の通りです::" -msgid ":ref:`select-drilldown-label-keys` uses the following output format::" +msgid ":ref:`select-drilldowns-label-keys` uses the following output format::" msgstr "" -":ref:`select-drilldown-label-keys` の出力フォーマットは以下の通りです::" +":ref:`select-drilldowns-label-keys` の出力フォーマットは以下の通りです::" msgid "Here is an example to disable caching the result of this query:" msgstr "このクエリーの結果をキャッシュしないようにする例です。" @@ -12562,11 +12502,11 @@ msgid "The following value part is the same format as ``SEARCH_RESULT``::" msgstr "以下の値の部分は ``SEARCH_RESULT`` と同じフォーマットです::" msgid "" -"See also :ref:`select-drilldown-label-output-format` for " +"See also :ref:`select-drilldowns-label-output-format` for " "``drilldowns[${LABEL}]`` style drilldown output format." msgstr "" -"``drilldowns[${LABEL}]`` スタイルのドリルダウンの出力形式については :ref:" -"`select-drilldown-label-output-format` も見てください。" +"``drilldownss[${LABEL}]`` スタイルのドリルダウンの出力形式については :ref:" +"`select-drilldowns-label-output-format` も見てください。" msgid "``shutdown``" msgstr "" @@ -17927,8 +17867,15 @@ msgstr "" "``query`` は2つの引数が必要です。 ``match_columns`` と ``query_string`` で" "す。" -msgid "The parameter ``query_expander`` or ``substitution_table`` is optional." -msgstr "引数の ``query_expander`` や ``substitution_table`` は省略可能です。" +msgid "" +"The parameter ``query_expander``, ``substitution_table`` and ``options`` are " +"optional." +msgstr "" +"引数の ``query_expander`` や ``substitution_table`` 、 ``options`` は省略可能" +"です。" + +msgid "``options`` accepts the following keys::" +msgstr "``options`` には以下のキーを指定します。::" msgid "" "Here is the simple usage of ``query`` function which execute full text " @@ -17939,33 +17886,34 @@ msgstr "" "``query`` 関数を使って検索する簡単な使用例です。" msgid "" -"When executing above query, the keyword 'alice' is weighted to the value - " -"'10'." +"When executing above query, the keyword ``alice`` is weighted to the value " +"``10``." msgstr "" -"上記のクエリを実行する際、'alice'というキーワードには重みづけとして値10を設定" -"します。" +"上記のクエリを実行する際、'alice'というキーワードには重みづけとして値 ``10`` " +"を設定します。" msgid "Here are the contrasting examples with/without ``query``." msgstr "``query`` あり/なしで対照的な例がこちらです。" msgid "" -"In this case, the keywords 'groonga' and 'mroonga' and 'user' are given same " -"weight value. You can't pass different weight value to each keyword in this " -"way." +"In this case, the all keywords ``groonga``, ``mroonga`` and ``user`` use the " +"default weight. You can't pass different weight value to each keyword in " +"this way." msgstr "" -"この場合、'groonga'と'mroonga'と'user'というキーワードは同じ重みづけがされて" -"います。この方法ではキーワードごとに異なる重みづけを行うことはできません。" +"この場合、 ``groonga`` と ``mroonga`` と ``user`` というキーワードは同じ重み" +"づけがされています。この方法ではキーワードごとに異なる重みづけを行うことはで" +"きません。" msgid "" -"On the other hand, by specifying multiple ``query``, the keywords 'groonga' " -"and 'mroonga' and 'user' are given different value of weight." +"On the other hand, by specifying multiple ``query``, the keywords " +"``groonga``, ``mroonga`` and ``user`` use different weight." msgstr "" -"一方、複数の ``query`` を指定することで、'groonga'と'mroonga'と'user'それぞれ" -"のキーワードに対し異なる重みづけを行えます。" +"一方、複数の ``query`` を指定することで、 ``groonga`` と ``mroonga`` と " +"``user`` それぞれのキーワードに対し異なる重みづけを行えます。" msgid "" -"As a result, you can control full text search result by giving different " -"weight to the keywords on your purpose." +"As a result, you can control full text search result score by specifying " +"different weight to the keywords on your purpose." msgstr "" "結果として、意図した様に異なる重みづけを行いつつ全文検索の振舞いを制御するこ" "とができます。" @@ -18026,6 +17974,28 @@ msgstr "" msgid "See :ref:`select-query-expander` about details." msgstr "詳細については :ref:`select-query-expander` を参照してください。" +msgid "``default_mode``" +msgstr "" + +msgid "" +"Specifies the default search operation. The search operation can customize " +"like ``column:@keyword`` syntax. The default search operation is used when " +"you just specify ``keyword`` instead of ``column:@keyword``. See :doc:`/" +"reference/grn_expr/query_syntax` for more syntax details." +msgstr "" + +msgid "Here are available modes. The default is ``MATCH`` mode." +msgstr "" + +msgid "Mode" +msgstr "" + +msgid "Aliases" +msgstr "別名" + +msgid "TDOO" +msgstr "" + msgid "" "``query`` returns whether any record is matched or not. If one or more " "records are matched, it returns ``true``. Otherwise, it returns ``false``." @@ -18034,9 +18004,6 @@ msgstr "" "コードがマッチしたら ``true`` を返します。1つもマッチしなかったら ``false`` " "を返します。" -msgid "Support query_flags" -msgstr "query_flagsのサポート" - msgid "rand" msgstr "" @@ -20239,21 +20206,38 @@ msgstr "" msgid "Near search operator" msgstr "近傍検索演算子" -msgid "Its syntax is ``column *N \"word1 word2 ...\"``." -msgstr "構文は ``column *N \"word1 word2 ...\"`` です。" +msgid "Its syntax is one of them::" +msgstr "構文は以下のどれかです。::" + +msgid "Here are the examples of the second form::" +msgstr "2つめの形式の例は次の通りです。" + +msgid "The first example means that ``29`` is used for the max interval." +msgstr "最初の例は近いと判断する最大距離として ``29`` を使うという意味です。" + +msgid "" +"The second example means that ``-1`` is used for the max interval. ``-1`` " +"max interval means no limit." +msgstr "" +"2つめの例は近いと判断する最大距離として ``-1`` を使うという意味です。 ``-1`` " +"はどれだけ離れていてもよいという意味です。" msgid "" "The operator does near search with words ``word1 word2 ...``. Near search " "searches records that contain the words and the words are appeared in the " -"near distance. Near distance is always ``10`` for now. The unit of near " -"distance is the number of characters in N-gram family tokenizers and the " -"number of words in morphological analysis family tokenizers." +"specified order and the max interval." msgstr "" "この演算子は ``word1 word2 ...`` という単語で近傍検索します。近傍検索はすべて" -"の単語が含まれていてかつそれぞれの単語が近くにあるレコードを検索します。距離" -"が ``10`` 以内の近さであれば近くにあると判断します。今のところ、この値は変更" -"できません。距離の単位はN-gram系のトークナイザーでは文字数で、形態素解析系の" -"トークナイザーでは単語数です。" +"の単語が含まれていてかつそれぞれが指定した順番で出現していてかつそれぞれの単" +"語が指定した距離以内にあるレコードを検索します。" + +msgid "" +"The max interval is ``10`` by default. The unit of the max interval is the " +"number of characters in N-gram family tokenizers and the number of words in " +"morphological analysis family tokenizers." +msgstr "" +"近いと判断する最大距離のでファオルトは ``10`` です。距離の単位はN-gram系の" +"トークナイザーでは文字数で、形態素解析系のトークナイザーでは単語数です。" msgid "" "(TODO: Add a description about ``TokenBigram`` doesn't split ASCII only word " @@ -20273,7 +20257,7 @@ msgstr "" msgid "" "The first expression matches records that contain ``I`` and ``fast`` and the " -"near distance of those words are in 10 words. So the record that its content " +"max interval of those words are in 10 words. So the record that its content " "is ``I also started to use mroonga. It's also very fast! ...`` is matched. " "The number of words between ``I`` and ``fast`` is just 10." msgstr "" @@ -20284,7 +20268,7 @@ msgstr "" msgid "" "The second expression matches records that contain ``I`` and ``Really`` and " -"the near distance of those words are in 10 words. So the record that its " +"the max interval of those words are in 10 words. So the record that its " "content is ``I also started to use mroonga. It's also very fast! Really fast!" "`` is not matched. The number of words between ``I`` and ``Really`` is 11." msgstr "" @@ -20295,7 +20279,7 @@ msgstr "" msgid "" "The third expression matches records that contain ``also`` and ``Really`` " -"and the near distance of those words are in 10 words. So the record that its " +"and the max interval of those words are in 10 words. So the record that its " "content is ``I also st arted to use mroonga. It's also very fast! Really " "fast!`` is matched. The number of words between ``also`` and ``Really`` is " "10." Modified: doc/source/reference/functions/query.rst (+45 -14) =================================================================== --- doc/source/reference/functions/query.rst 2017-01-18 16:41:15 +0900 (cbb09e3) +++ doc/source/reference/functions/query.rst 2017-01-18 16:55:07 +0900 (198fa0c) @@ -27,13 +27,23 @@ Syntax ``query`` requires two arguments - ``match_columns`` and ``query_string``. -The parameter ``query_expander`` or ``substitution_table`` is optional. +The parameter ``query_expander``, ``substitution_table`` and +``options`` are optional. :: query(match_columns, query_string) query(match_columns, query_string, query_expander) query(match_columns, query_string, substitution_table) + query(match_columns, query_string, options) + +``options`` accepts the following keys:: + + { + "expander": query_expander, + "default_mode": default_mode, + "flags": flags + } Usage @@ -79,8 +89,8 @@ search by keyword 'alice' without using ``--match_columns`` and .. include:: ../../example/reference/functions/query/usage_basic.log .. select Users --output_columns name,_score --filter 'query("name * 10", "alice")' -When executing above query, the keyword 'alice' is weighted to the value - -'10'. +When executing above query, the keyword ``alice`` is weighted to the +value ``10``. Here are the contrasting examples with/without ``query``. @@ -88,20 +98,19 @@ Here are the contrasting examples with/without ``query``. .. include:: ../../example/reference/functions/query/usage_without_query.log .. select Users --output_columns name,memo,_score --match_columns "memo * 10" --query "memo:@groonga OR memo:@mroonga OR memo:@user" --sortby -_score -In this case, the keywords 'groonga' and 'mroonga' and 'user' are -given same weight value. -You can't pass different weight value to each keyword in this way. - +In this case, the all keywords ``groonga``, ``mroonga`` and ``user`` +use the default weight. You can't pass different weight value to each +keyword in this way. .. groonga-command .. include:: ../../example/reference/functions/query/usage_with_query.log .. select Users --output_columns name,memo,_score --filter 'query("memo * 10", "groonga") || query("memo * 20", "mroonga") || query("memo * 1", "user")' --sortby -_score On the other hand, by specifying multiple ``query``, the keywords -'groonga' and 'mroonga' and 'user' are given different value of weight. +``groonga``, ``mroonga`` and ``user`` use different weight. -As a result, you can control full text search result by giving different weight to the -keywords on your purpose. +As a result, you can control full text search result score by +specifying different weight to the keywords on your purpose. Parameters ---------- @@ -151,6 +160,32 @@ by following format such as ``${TABLE}.${COLUMN}`` for query expansion. See :ref:`select-query-expander` about details. +``default_mode`` +"""""""""""""""" + +Specifies the default search operation. The search operation can +customize like ``column:@keyword`` syntax. The default search +operation is used when you just specify ``keyword`` instead of +``column:@keyword``. See :doc:`/reference/grn_expr/query_syntax` for +more syntax details. + +Here are available modes. The default is ``MATCH`` mode. + +.. list-table:: + :header-rows: 1 + + * - Mode + - Aliases + - Description + * - TODO + - TODO + - TDOO + +``flags`` +""""""""" + +TODO + Return value ------------ @@ -158,10 +193,6 @@ Return value records are matched, it returns ``true``. Otherwise, it returns ``false``. -TODO ----- - -* Support query_flags See also -------- Modified: doc/source/reference/grn_expr/script_syntax.rst (+24 -10) =================================================================== --- doc/source/reference/grn_expr/script_syntax.rst 2017-01-18 16:41:15 +0900 (dac9d30) +++ doc/source/reference/grn_expr/script_syntax.rst 2017-01-18 16:55:07 +0900 (1aa3464) @@ -978,14 +978,28 @@ with the expression. Near search operator ^^^^^^^^^^^^^^^^^^^^ -Its syntax is ``column *N "word1 word2 ..."``. +Its syntax is one of them:: + + column *N "word1 word2 ..." + column *N${MAX_INTERVAL} "word1 word2 ..." + +Here are the examples of the second form:: + + column *N29 "word1 word2 ..." + column *N-1 "word1 word2 ..." + +The first example means that ``29`` is used for the max interval. + +The second example means that ``-1`` is used for the max interval. +``-1`` max interval means no limit. The operator does near search with words ``word1 word2 ...``. Near search searches records that contain the words and the words are -appeared in the near distance. Near distance is always ``10`` for -now. The unit of near distance is the number of characters in N-gram -family tokenizers and the number of words in morphological analysis -family tokenizers. +appeared in the specified order and the max interval. + +The max interval is ``10`` by default. The unit of the max interval is +the number of characters in N-gram family tokenizers and the number of +words in morphological analysis family tokenizers. (TODO: Add a description about ``TokenBigram`` doesn't split ASCII only word into tokens. So the unit for ASCII words with @@ -1004,19 +1018,19 @@ Here is a simple example. .. select Entries --filter 'content *N "also Really"' --output_columns content The first expression matches records that contain ``I`` and ``fast`` -and the near distance of those words are in 10 words. So the record +and the max interval of those words are in 10 words. So the record that its content is ``I also started to use mroonga. It's also very fast! ...`` is matched. The number of words between ``I`` and ``fast`` is just 10. The second expression matches records that contain ``I`` and -``Really`` and the near distance of those words are in 10 words. So -the record that its content is ``I also started to use mroonga. It's -also very fast! Really fast!`` is not matched. The number of words between +``Really`` and the max interval of those words are in 10 words. So the +record that its content is ``I also started to use mroonga. It's also +very fast! Really fast!`` is not matched. The number of words between ``I`` and ``Really`` is 11. The third expression matches records that contain ``also`` and -``Really`` and the near distance of those words are in 10 words. So +``Really`` and the max interval of those words are in 10 words. So the record that its content is ``I also st arted to use mroonga. It's also very fast! Really fast!`` is matched. The number of words between ``also`` and ``Really`` is 10. -------------- next part -------------- HTML����������������������������...Download