rroonga 2.0.4-x86-mingw32 → 2.0.7-x86-mingw32

data/vendor/local/share/doc/groonga/source/tutorial/data.txt

@@ -15,7 +15,7 @@ Groonga is a full text search engine but also serves as a column-oriented data s
 Overview
 --------
 
-The basic data types of groonga are roughly divided into 5 groups --- boolean type, numeric types, string types, date/time type and longitude/latitude types. The numeric types are further divided according to whether integer or floating point number, signed or unsigned and the number of bits allocated to each integer. The string types are further divided according to the maximum length. The longitude/latitude types are further divided according to the geographic coordinate system. For more details, see :doc:`/type`.
+The basic data types of groonga are roughly divided into 5 groups --- boolean type, numeric types, string types, date/time type and longitude/latitude types. The numeric types are further divided according to whether integer or floating point number, signed or unsigned and the number of bits allocated to each integer. The string types are further divided according to the maximum length. The longitude/latitude types are further divided according to the geographic coordinate system. For more details, see :doc:`/reference/type`.
 
 In addition, groonga supports reference types and vector types. Reference types are designed for accessing other tables. Vector types are designed for storing a variable number of values in one element.
 
@@ -28,7 +28,7 @@ First, let's create a table for this tutorial.
 Boolean type
 ------------
 
-The boolean type is used to store true or false. To create a boolean type column, specify Bool to the `type` parameter of :doc:`/commands/column_create` command. The default value of the boolean type is false.
+The boolean type is used to store true or false. To create a boolean type column, specify Bool to the `type` parameter of :doc:`/reference/commands/column_create` command. The default value of the boolean type is false.
 
 The following example creates a boolean type column and adds three records. Note that the third record has the default value because no value is specified.
 
@@ -46,9 +46,9 @@ The following example creates a boolean type column and adds three records. Note
 Numeric types
 -------------
 
-The numeric types are divided into integer types and a floating point number type. The integer types are further divided into the signed integer types and unsigned integer types. In addition, you can choose the number of bits allocated to each integer. For more details, see :doc:`/type`. The default value of the numeric types is 0.
+The numeric types are divided into integer types and a floating point number type. The integer types are further divided into the signed integer types and unsigned integer types. In addition, you can choose the number of bits allocated to each integer. For more details, see :doc:`/reference/type`. The default value of the numeric types is 0.
 
-The following example creates an Int8 column and a Float column, and then updates existing records. The :doc:`/commands/load` command updates the weight column as expected. On the other hand, the price column values are different from the specified values because 15.9 is not an integer and 200 is too large. 15.9 is converted to 15 by removing the fractional part. 200 causes an overflow and the result becomes -56. Note that the result of an overflow/underflow is undefined.
+The following example creates an Int8 column and a Float column, and then updates existing records. The :doc:`/reference/commands/load` command updates the weight column as expected. On the other hand, the price column values are different from the specified values because 15.9 is not an integer and 200 is too large. 15.9 is converted to 15 by removing the fractional part. 200 causes an overflow and the result becomes -56. Note that the result of an overflow/underflow is undefined.
 
 .. groonga-command
 .. include:: ../example/tutorial/data-3.log
@@ -65,7 +65,7 @@ The following example creates an Int8 column and a Float column, and then update
 String types
 ------------
 
-The string types are divided according to the maximum length. For more details, see :doc:`/type`. The default value is the zero-length string.
+The string types are divided according to the maximum length. For more details, see :doc:`/reference/type`. The default value is the zero-length string.
 
 The following example creates a ShortText column and updates existing records. The third record has the default value because not updated.
 
@@ -82,7 +82,7 @@ The following example creates a ShortText column and updates existing records. T
 Date and time type
 ------------------
 
-The date and time type of groonga is Time. Actually, a Time column stores a date and time as the number of microseconds since the Epoch, 1970-01-01 00:00:00. A Time value can represent a date and time before the Epoch because the actual data type is a signed integer. Note that :doc:`/commands/load` and :doc:`/commands/select` commands use a decimal number to represent a data and time in seconds. The default value is 0.0, which means the Epoch.
+The date and time type of groonga is Time. Actually, a Time column stores a date and time as the number of microseconds since the Epoch, 1970-01-01 00:00:00. A Time value can represent a date and time before the Epoch because the actual data type is a signed integer. Note that :doc:`/reference/commands/load` and :doc:`/reference/commands/select` commands use a decimal number to represent a data and time in seconds. The default value is 0.0, which means the Epoch.
 
 The following example creates a Time column and updates existing records. The first record has the default value because not updated.
 
@@ -99,7 +99,7 @@ The following example creates a Time column and updates existing records. The fi
 Longitude and latitude types
 ----------------------------
 
-The longitude and latitude types are divided according to the geographic coordinate system. For more details, see :doc:`/type`. To represent a longitude and latitude, groonga uses a string formatted as follows:
+The longitude and latitude types are divided according to the geographic coordinate system. For more details, see :doc:`/reference/type`. To represent a longitude and latitude, groonga uses a string formatted as follows:
 
 * "longitude x latitude" in milliseconds (e.g.: "128452975x503157902")
 * "longitude x latitude" in degrees (e.g.: "35.6813819x139.7660839")
@@ -123,7 +123,7 @@ Reference types
 
 Groonga supports a reference column, which stores references to records in its associated table. In practice, a reference column stores the IDs of the referred records in the associated table and enables access to those records.
 
-You can specify a column in the associated table to the `output_columns` parameter of a :doc:`/commands/select` command. The format is "Src.Dest" where Src is the name of the reference column and Dest is the name of the target column. If only the reference column is specified, it is handled as "Src._key". Note that if a reference does not point to a valid record, a :doc:`/commands/select` command outputs the default value of the target column.
+You can specify a column in the associated table to the `output_columns` parameter of a :doc:`/reference/commands/select` command. The format is "Src.Dest" where Src is the name of the reference column and Dest is the name of the target column. If only the reference column is specified, it is handled as "Src._key". Note that if a reference does not point to a valid record, a :doc:`/reference/commands/select` command outputs the default value of the target column.
 
 The following example adds a reference column to the Site table that was created in the previous tutorial. The new column, named link, is designed for storing links among records in the Site table.
 
@@ -134,12 +134,12 @@ The following example adds a reference column to the Site table that was created
 .. [{"_key":"http://example.org/","link":"http://example.net/"}]
 .. select --table Site --output_columns _key,title,link._key,link.title --query title:@this
 
-The `type` parameter of the :doc:`/commands/column_create` command specifies the table to be associated with the reference column. In this example, the reference column is associated with the own table. Then, the :doc:`/commands/load` command registers a link from "http://example.org" to "http://example.net". Note that a reference column requires the primary key, not the ID, of the record to be referred to. After that, the link is confirmed by the :doc:`/commands/select` command. In this case, the primary key and the title of the referred record are output because link._key and link.title are specified to the `output_columns` parameter.
+The `type` parameter of the :doc:`/reference/commands/column_create` command specifies the table to be associated with the reference column. In this example, the reference column is associated with the own table. Then, the :doc:`/reference/commands/load` command registers a link from "http://example.org" to "http://example.net". Note that a reference column requires the primary key, not the ID, of the record to be referred to. After that, the link is confirmed by the :doc:`/reference/commands/select` command. In this case, the primary key and the title of the referred record are output because link._key and link.title are specified to the `output_columns` parameter.
 
 Vector types
 ------------
 
-Groonga supports a vector column, in which each element can store a variable number of values. To create a vector column, specify the COLUMN_VECTOR flag to the `flags` parameter of a :doc:`/commands/column_create` command. A vector column is useful to represent a many-to-many relationship.
+Groonga supports a vector column, in which each element can store a variable number of values. To create a vector column, specify the COLUMN_VECTOR flag to the `flags` parameter of a :doc:`/reference/commands/column_create` command. A vector column is useful to represent a many-to-many relationship.
 
 The previous example used a regular column, so each record could have at most one link. Obviously, the specification is insufficient because a site usually has more than one links. To solve this problem, the following example uses a vector column.
 
@@ -152,4 +152,4 @@ The previous example used a regular column, so each record could have at most on
 .. [{"_key":"http://example.org/","links":["http://example.net/","http://example.org/","http://example.com/"]}]
 .. select --table Site --output_columns _key,title,links._key,links.title --query title:@this
 
-The only difference at the first step is the `flags` parameter that specifies to create a vector column. The `type` parameter of the :doc:`/commands/column_create` command is the same as in the previous example. Then, the :doc:`/commands/load` command registers three links from "http://example.org/" to "http://example.net/", "http://example.org/" and "http://example.com/". After that, the links are confirmed by the :doc:`/commands/select` command. In this case, the primary keys and the titles are output as arrays because links._key and links.title are specified to the `output_columns` parameter.
+The only difference at the first step is the `flags` parameter that specifies to create a vector column. The `type` parameter of the :doc:`/reference/commands/column_create` command is the same as in the previous example. Then, the :doc:`/reference/commands/load` command registers three links from "http://example.org/" to "http://example.net/", "http://example.org/" and "http://example.com/". After that, the links are confirmed by the :doc:`/reference/commands/select` command. In this case, the primary keys and the titles are output as arrays because links._key and links.title are specified to the `output_columns` parameter.

data/vendor/local/share/doc/groonga/source/tutorial/introduction.txt

@@ -42,7 +42,7 @@ DB_PATH specifies the path of a target database. This command fails if the speci
 
 If COMMAND is specified, groonga executes COMMAND and returns the result. Otherwise, groonga starts in interactive mode that reads commands from the standard input and executes them one by one. This tutorial focuses on the interactive mode.
 
-Let's see the status of a groonga process by using a :doc:`/commands/status` command.
+Let's see the status of a groonga process by using a :doc:`/reference/commands/status` command.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-2.log
@@ -66,34 +66,34 @@ In the second form, you can specify a parameter name with its value. So, the ord
 
 If you want to specify a value which contains white-spaces or special characters, such as quotes and parentheses, please enclose the value with single-quotes or double-quotes.
 
-For details, see also the paragraph of "command" in :doc:`/executables/groonga`.
+For details, see also the paragraph of "command" in :doc:`/reference/executables/groonga`.
 
 Basic commands
 --------------
 
- :doc:`/commands/status`
+ :doc:`/reference/commands/status`
   shows status of a groonga process.
- :doc:`/commands/table_list`
+ :doc:`/reference/commands/table_list`
   shows a list of tables in a database.
- :doc:`/commands/column_list`
+ :doc:`/reference/commands/column_list`
   shows a list of columns in a table.
- :doc:`/commands/table_create`
+ :doc:`/reference/commands/table_create`
   adds a table to a database.
- :doc:`/commands/column_create`
+ :doc:`/reference/commands/column_create`
   adds a column to a table.
- :doc:`/commands/select`
+ :doc:`/reference/commands/select`
   searches records from a table and shows the result.
- :doc:`/commands/load`
+ :doc:`/reference/commands/load`
   inserts records to a table.
 
 Create a table
 --------------
 
-A :doc:`/commands/table_create` command creates a new table.
+A :doc:`/reference/commands/table_create` command creates a new table.
 
 In most cases, a table has a primary key which must be specified with its data type and index type. 
 
-There are various data types such as integers, strings, etc. See also :doc:`/type` for more details. The index type determines the search performance and the availability of prefix searches. The details will be described later.
+There are various data types such as integers, strings, etc. See also :doc:`/reference/type` for more details. The index type determines the search performance and the availability of prefix searches. The details will be described later.
 
 Let's create a table. The following example creates a table with a primary key. The `name` parameter specifies the name of the table. The `flags` parameter specifies the index type for the primary key. The `key_type` parameter specifies the data type of the primary key.
 
@@ -106,20 +106,20 @@ The second element of the result indicates that the operation succeeded.
 View a table
 ------------
 
-A :doc:`/commands/select` command can enumerate records in a table.
+A :doc:`/reference/commands/select` command can enumerate records in a table.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-4.log
 .. select --table Site
 
-When only a table name is specified with a `table` parameter, a :doc:`/commands/select` command returns the first (at most) 10 records in the table. [0] in the result shows the number of records in the table. The next array is a list of columns. ["_id","Uint32"] is a column of UInt32, named _id. ["_key","ShortText"] is a column of ShortText, named _key.
+When only a table name is specified with a `table` parameter, a :doc:`/reference/commands/select` command returns the first (at most) 10 records in the table. [0] in the result shows the number of records in the table. The next array is a list of columns. ["_id","Uint32"] is a column of UInt32, named _id. ["_key","ShortText"] is a column of ShortText, named _key.
 
 The above two columns, _id and _key, are the necessary columns. The _id column stores IDs those are automatically allocated by groonga. The _key column is associated with the primary key. You are not allowed to rename these columns.
 
 Create a column
 ---------------
 
-A :doc:`/commands/column_create` command creates a new column.
+A :doc:`/reference/commands/column_create` command creates a new column.
 
 Let's add a column. The following example adds a column to the Site table. The `table` parameter specifies the target table. The `name` parameter specifies the name of the column. The `type` parameter specifies the data type of the column.
 
@@ -131,7 +131,7 @@ Let's add a column. The following example adds a column to the Site table. The `
 Load records
 ------------
 
-A :doc:`/commands/load` command loads JSON-formatted records into a table.
+A :doc:`/reference/commands/load` command loads JSON-formatted records into a table.
 
 The following example loads nine records into the Site table.
 
@@ -161,9 +161,9 @@ Let's make sure that these records are correctly stored.
 Get a record
 ------------
 
-A :doc:`/commands/select` command can search records in a table.
+A :doc:`/reference/commands/select` command can search records in a table.
 
-If a search condition is specified with a `query` parameter, a :doc:`/commands/select` command searches records matching the search condition and returns the matched records.
+If a search condition is specified with a `query` parameter, a :doc:`/reference/commands/select` command searches records matching the search condition and returns the matched records.
 
 Let's get a record having a specified record ID. The following example gets the first record in the Site table. More precisely, the `query` parameter specifies a record whose _id column stores 1.
 
@@ -190,7 +190,7 @@ The following shows a command which creates a lexicon table named Terms. The dat
 .. include:: ../example/tutorial/introduction-10.log
 .. table_create --name Terms --flags TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText --default_tokenizer TokenBigram
 
-The :doc:`/commands/table_create` command takes many parameters but you don't need to understand all of them. Please skip the next paragraph if you are not interested in how it works.
+The :doc:`/reference/commands/table_create` command takes many parameters but you don't need to understand all of them. Please skip the next paragraph if you are not interested in how it works.
 
 The TABLE_PAT_KEY flag specifies to store index terms in a patricia trie. The KEY_NORMALIZE flag specifies to normalize index terms. In this example, both flags are validated by using a '|'. The `default_tokenizer` parameter specifies the method for tokenizing text. This example uses TokenBigram that is generally called N-gram.
 
@@ -214,7 +214,7 @@ The `table` parameter specifies the index table and the `name` parameter specifi
 Full text search
 ----------------
 
-It's time. You can make full text search with a :doc:`/commands/select` command.
+It's time. You can make full text search with a :doc:`/reference/commands/select` command.
 
 A query for full text search is specified with a `query` parameter. The following example searches records whose "title" column contains "this". The '@' specifies to make full text search. Note that a lower case query matches upper case and capitalized terms in a record if KEY_NORMALIZE was specified when creating a lexcon table.
 
@@ -224,7 +224,7 @@ A query for full text search is specified with a `query` parameter. The followin
 
 In this example, the first record matches the query because its title contains "This", that is the capitalized form of the query.
 
-A :doc:`/commands/select` command accepts an optional parameter, named `match_columns`, that specifies the default target columns. This parameter is used if target columns are not specified in a query. [#]_
+A :doc:`/reference/commands/select` command accepts an optional parameter, named `match_columns`, that specifies the default target columns. This parameter is used if target columns are not specified in a query. [#]_
 
 The combination of "`--match_columns` title" and "`--query` this" brings you the same result that "`--query` title:@this" does.
 
@@ -235,7 +235,7 @@ The combination of "`--match_columns` title" and "`--query` this" brings you the
 Specify output columns
 ----------------------
 
-An `output_columns` parameter of a :doc:`/commands/select` command specifies columns to appear in the search result. If you want to specify more than one columns, please separate column names by commas (',').
+An `output_columns` parameter of a :doc:`/reference/commands/select` command specifies columns to appear in the search result. If you want to specify more than one columns, please separate column names by commas (',').
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-14.log
@@ -246,7 +246,7 @@ This example specifies three output columns including the _score column, which s
 Specify output ranges
 ---------------------
 
-A :doc:`/commands/select` command returns a part of its search result if `offset` and/or `limit` parameters are specified. These parameters are useful to paginate a search result, a widely-used interface which shows a search result on a page by page basis.
+A :doc:`/reference/commands/select` command returns a part of its search result if `offset` and/or `limit` parameters are specified. These parameters are useful to paginate a search result, a widely-used interface which shows a search result on a page by page basis.
 
 An `offset` parameter specifies the starting point and a `limit` parameter specifies the maximum number of records to be returned. If you need the first record in a search result, the offset parameter must be 0 or omitted.
 
@@ -259,7 +259,7 @@ An `offset` parameter specifies the starting point and a `limit` parameter speci
 Sort a search result
 --------------------
 
-A :doc:`/commands/select` command sorts its result when used with a `sortby` parameter.
+A :doc:`/reference/commands/select` command sorts its result when used with a `sortby` parameter.
 
 A `sortby` parameter specifies a column as a sorting creteria. A search result is arranged in ascending order of the column values. If you want to sort a search result in reverse order, please add a leading hyphen ('-') to the column name in a parameter.
 

data/vendor/local/share/doc/groonga/source/tutorial/micro_blog.txt

@@ -239,7 +239,9 @@ Usersテーブルのfollowerカラムとfavoritesカラム、そしてComments
 
 Usersテーブルのlocationカラムと、Commentsテーブルのlocationカラムは、GeoPoint型です。この型での値の指定は、"[緯度]x[経度]"と記述して指定します。
 
-Commentsテーブルのlast_modifiedカラムは、Time型です。この型での値の指定方法は、マイクロ秒数の値を直接指定する方法のほかに、文字列で指定する方法もあります。"年/月/日 時:分:秒"というフォーマットで記述することで、データロードの際に文字列からキャストされ、マイクロ秒数の値が格納されます。
+Commentsテーブルのlast_modifiedカラムは、Time型です。この型での値を指定する方法は2つあります。
+1つ目の方法は、1970年1月1日0時0分0秒からの経過秒数の値を直接指定する方法です。このとき、小数部分を指定することでマイクロ秒数での指定が可能です。指定した値は、データのロードの際にマイクロ秒を単位とする整数値に変換後、格納されます。
+2つ目の方法は、文字列で日時と時刻を指定する方法です。"年/月/日 時:分:秒"というフォーマットで記述することで、データロードの際に文字列からキャストされ、マイクロ秒数の値が格納されます。
 
 .. groonga-command
 ..

data/vendor/local/share/doc/groonga/source/tutorial/network.txt

@@ -74,7 +74,7 @@ In interactive mode, groonga reads commands from the standard input and executes
 How to terminate a gqtp server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You can terminate a gqtp server with a :doc:`/commands/shutdown` command.
+You can terminate a gqtp server with a :doc:`/reference/commands/shutdown` command.
 
 .. groonga-command
 .. include:: ../example/tutorial/network-2.log

data/vendor/local/share/doc/groonga/source/tutorial/patricia_trie.txt

@@ -23,9 +23,10 @@ table_createコマンドのflagsオプションにTABLE_PAT_KEYを指定する
 .. [
 .. {"_key":"ひろゆき"},
 .. {"_key":"まろゆき"},
-.. {"_key":"ひろあき"}
+.. {"_key":"ひろあき"},
+.. {"_key":"ゆきひろ"}
 .. ]
-.. select --table PatPrefix --query _key:@ひろ
+.. select --table PatPrefix --query _key:^ひろ
 
 主キーによる後方一致検索
 ------------------------
@@ -34,7 +35,7 @@ table_createコマンドのflagsオプションにTABLE_PAT_KEYとKEY_WITH_SIS
 
 KEY_WITH_SISフラグを付与すると、データを追加する際に後方一致用のレコードも追加されてしまいます。そのため、単純に検索すると、元のレコードに加えて自動的に追加されたレコードまでヒットしてしまいます。元のレコードのみ検索するために、一工夫必要になります。
 
-例えば、元のレコードと自動的に追加されたレコードとの区別をつけるために、元のレコードであることを示すoriginalカラムを追加して、検索時にはoriginalカラムが ``true`` も検索条件に加えます。
+例えば、元のレコードと自動的に追加されたレコードとの区別をつけるために、元のレコードであることを示すoriginalカラムを追加して、検索時にはoriginalカラムが ``true`` も検索条件に加えます。 ``--query`` オプションでは ``Bool`` 型の値を直感的に指定することができないので ``--filter`` オプションを使っていることに注意してください。
 
 .. groonga-command
 .. include:: ../example/tutorial/patricia_trie-2.log
@@ -45,7 +46,8 @@ KEY_WITH_SISフラグを付与すると、データを追加する際に後方
 .. [
 .. {"_key":"ひろゆき","original":true},
 .. {"_key":"まろゆき","original":true},
-.. {"_key":"ひろあき","original":true}
+.. {"_key":"ひろあき","original":true},
+.. {"_key":"ゆきひろ","original":true}
 .. ]
-.. select --table PatSuffix --query _key:@ゆき
-.. select --table PatSuffix --query "_key:@ゆき original:true"
+.. select --table PatSuffix --query _key:$ゆき
+.. select --table PatSuffix --filter '_key @$ "ゆき" && original == true'

data/vendor/local/share/doc/groonga/source/tutorial/query_expansion.txt

@@ -8,7 +8,7 @@
 クエリ拡張
 ==========
 
-groongaでは、 :doc:`/commands/select` コマンドにquery_expansionパラメータを指定することによって、ユーザが指定した検索文字列を適宜拡張することが可能です。
+groongaでは、 :doc:`/reference/commands/select` コマンドにquery_expansionパラメータを指定することによって、ユーザが指定した検索文字列を適宜拡張することが可能です。
 
 たとえば、ユーザが'シークヮーサー'という文字列で検索した場合に、'シークヮーサー OR シークァーサー'で検索した場合と同一の結果を返すことによって、本来ユーザが必要とする結果をよりもれなく検索できるようになります。
 

data/vendor/local/share/doc/groonga/source/tutorial/search.txt

@@ -92,7 +92,7 @@ groongaでは、位置情報（経緯度）を保存することができます
 .. ]
 .. select --table Site --query "_id:1 OR _id:2" --output_columns _key,location
 
-scorerパラメータにおいて、 :doc:`/functions/geo_distance` 関数を用いることにより、２点間の距離を計算することができます。
+scorerパラメータにおいて、 :doc:`/reference/functions/geo_distance` 関数を用いることにより、２点間の距離を計算することができます。
 
 ここでは、秋葉原駅からの距離を表示させてみましょう。世界測地系では、秋葉原駅の位置は緯度が35度41分55.259秒、経度が139度46分27.188秒です。よって、geo_distance関数に与える文字列は"128515259x503187188"となります。
 
@@ -110,7 +110,7 @@ geo_distance関数は、_scoreを通じてソートでも用いることがで
 
 「ある地点から何m以内に存在する」といった絞込も可能です。
 
-filterパラメータにおいて、 :doc:`/functions/geo_in_circle` 関数を用いることにより、２点間の距離が指定のm以下におさまるかどうかを判定することができます。
+filterパラメータにおいて、 :doc:`/reference/functions/geo_in_circle` 関数を用いることにより、２点間の距離が指定のm以下におさまるかどうかを判定することができます。
 
 たとえば、秋葉原駅から5000m以内にあるレコードを検索してみましょう。
 
@@ -118,4 +118,4 @@ filterパラメータにおいて、 :doc:`/functions/geo_in_circle` 関数を
 .. include:: ../example/tutorial/search-7.log
 .. select --table Site --output_columns _key,location --filter 'geo_in_circle(location, "128515259x503187188", 5000)'
 
-また、経緯度が指定の矩形領域内であるかどうかを判定する :doc:`../functions/geo_in_rectangle` 関数も存在します。
+また、経緯度が指定の矩形領域内であるかどうかを判定する :doc:`/reference/functions/geo_in_rectangle` 関数も存在します。

data/vendor/local/share/groonga/html/admin/js/groonga-admin.js

@@ -1318,16 +1318,21 @@ jQuery.extend(GroongaAdmin.prototype, {
       i--;
     }
     if ( $("#loadingdialog").size() == 0 && !hide_dialog) {
-      var errtext;
+      var error_label;
+      var error_message;
       if (json){
-        errtext = "groongaでエラーが発生しました。<br>" + json[0][3] + "(" + json[0][0] + ")";
+        error_label = "groongaでエラーが発生しました。";
+        error_message = json[0][3] + "(" + json[0][0] + ")";
       } else if (ajax) {
-        errtext = "通信エラーが発生しました。<br>" + ajax.status + ajax.statusText;
+        error_label = "通信エラーが発生しました。";
+        error_message = "" + ajax.status + ": " + ajax.statusText;
       } else {
-        errtext = "通信エラーが発生しました。";
+        error_label = "通信エラーが発生しました。";
+        error_message = "";
       }
       $("<div />")
-        .append(errtext)
+        .append($("<div />").text(error_label))
+        .append($("<div />").text(error_message))
         .attr("id", "loadingdialog")
         .dialog({
           title: "",