null+****@clear*****
null+****@clear*****
2011年 12月 9日 (金) 15:59:19 JST
Kouhei Sutou 2011-12-09 06:59:19 +0000 (Fri, 09 Dec 2011)
New Revision: ab331a6bee9a155cb5db77e31012e28f6e9bf398
Log:
[doc][example] always specify database in each file.
Modified files:
doc/source/tutorial/data.txt
doc/source/tutorial/drilldown.txt
doc/source/tutorial/index.txt
doc/source/tutorial/introduction.txt
doc/source/tutorial/match_columns.txt
doc/source/tutorial/micro_blog.txt
doc/source/tutorial/network.txt
doc/source/tutorial/patricia_trie.txt
doc/source/tutorial/query_expansion.txt
doc/source/tutorial/search.txt
doc/source/update_execution_example.py
Modified: doc/source/tutorial/data.txt (+3 -1)
===================================================================
--- doc/source/tutorial/data.txt 2011-12-09 06:30:59 +0000 (a7cc086)
+++ doc/source/tutorial/data.txt 2011-12-09 06:59:19 +0000 (278c7c9)
@@ -4,6 +4,9 @@
.. groonga-include : introduction.txt
+.. groonga-command
+.. database: tutorial
+
さまざまな種類をもったデータの保存
==================================
@@ -19,7 +22,6 @@ groongaでは、数値（整数・小数）や文字列や時刻や経緯度な
その他のデータ型の一覧は、 :doc:`/type` を参照してください。
.. groonga-command
-.. table_remove Type
.. include:: ../example/tutorial/data-1.log
.. table_create --name Type --flags TABLE_HASH_KEY --key_type ShortText
.. column_create --table Type --name number --type Int32
Modified: doc/source/tutorial/drilldown.txt (+1 -3)
===================================================================
--- doc/source/tutorial/drilldown.txt 2011-12-09 06:30:59 +0000 (2944715)
+++ doc/source/tutorial/drilldown.txt 2011-12-09 06:59:19 +0000 (87c1bfb)
@@ -5,9 +5,7 @@
.. groonga-include : search.txt
.. groonga-command
-.. table_remove SiteDomain
-.. table_remove SiteCountry
-
+.. database: tutorial
ドリルダウン
============
Modified: doc/source/tutorial/index.txt (+2 -1)
===================================================================
--- doc/source/tutorial/index.txt 2011-12-09 06:30:59 +0000 (3dbdd81)
+++ doc/source/tutorial/index.txt 2011-12-09 06:59:19 +0000 (7dad788)
@@ -3,8 +3,9 @@
.. highlightlang:: none
.. groonga-include : drilldown.txt
+
.. groonga-command
-.. table_remove GeoIndex
+.. database: tutorial
タグ検索・参照関係の逆引き
==========================
Modified: doc/source/tutorial/introduction.txt (+0 -2)
===================================================================
--- doc/source/tutorial/introduction.txt 2011-12-09 06:30:59 +0000 (1b72da9)
+++ doc/source/tutorial/introduction.txt 2011-12-09 06:59:19 +0000 (a17adbb)
@@ -4,8 +4,6 @@
.. groonga-command
.. database: tutorial
-.. table_remove Site
-.. table_remove Terms
Basic operations
================
Modified: doc/source/tutorial/match_columns.txt (+1 -4)
===================================================================
--- doc/source/tutorial/match_columns.txt 2011-12-09 06:30:59 +0000 (155c711)
+++ doc/source/tutorial/match_columns.txt 2011-12-09 06:59:19 +0000 (49b6e38)
@@ -3,10 +3,7 @@
.. highlightlang:: none
.. groonga-command
-.. table_remove Blog1
-.. table_remove IndexBlog1
-.. table_remove Blog2
-.. table_remove IndexBlog2
+.. database: tutorial-match-columns
match_columnsパラメータ
=======================
Modified: doc/source/tutorial/micro_blog.txt (+1 -4)
===================================================================
--- doc/source/tutorial/micro_blog.txt 2011-12-09 06:30:59 +0000 (99dc089)
+++ doc/source/tutorial/micro_blog.txt 2011-12-09 06:59:19 +0000 (ea0bbe0)
@@ -3,10 +3,7 @@
.. highlightlang:: none
.. groonga-command
-.. table_remove Users
-.. table_remove Comments
-.. table_remove HashTags
-.. table_remove Bigram
+.. database: tutorial-micro-blog
マイクロブログ検索システムの作成
================================
Modified: doc/source/tutorial/network.txt (+3 -0)
===================================================================
--- doc/source/tutorial/network.txt 2011-12-09 06:30:59 +0000 (25d99e5)
+++ doc/source/tutorial/network.txt 2011-12-09 06:59:19 +0000 (9049835)
@@ -4,6 +4,9 @@
.. groonga-include : introduction.txt
+.. groonga-command
+.. database: tutorial
+
How to use groonga with network
===============================
Modified: doc/source/tutorial/patricia_trie.txt (+1 -2)
===================================================================
--- doc/source/tutorial/patricia_trie.txt 2011-12-09 06:30:59 +0000 (baf956f)
+++ doc/source/tutorial/patricia_trie.txt 2011-12-09 06:59:19 +0000 (a4760a1)
@@ -3,8 +3,7 @@
.. highlightlang:: none
.. groonga-command
-.. table_remove PatPrefix
-.. table_remove PatSuffix
+.. database: tutorial-patricia-trie
パトリシア木による前方一致検索
==============================
Modified: doc/source/tutorial/query_expansion.txt (+3 -0)
===================================================================
--- doc/source/tutorial/query_expansion.txt 2011-12-09 06:30:59 +0000 (8dc6dbc)
+++ doc/source/tutorial/query_expansion.txt 2011-12-09 06:59:19 +0000 (a5525b6)
@@ -2,6 +2,9 @@
.. highlightlang:: none
+.. groonga-command
+.. database: tutorial-query-expansion
+
クエリ拡張
==========
Modified: doc/source/tutorial/search.txt (+3 -0)
===================================================================
--- doc/source/tutorial/search.txt 2011-12-09 06:30:59 +0000 (db50c1c)
+++ doc/source/tutorial/search.txt 2011-12-09 06:59:19 +0000 (9970501)
@@ -4,6 +4,9 @@
.. groonga-include : data.txt
+.. groonga-command
+.. database: tutorial
+
さまざまな検索条件の指定
========================
Modified: doc/source/update_execution_example.py (+6 -2)
===================================================================
--- doc/source/update_execution_example.py 2011-12-09 06:30:59 +0000 (0367eba)
+++ doc/source/update_execution_example.py 2011-12-09 06:59:19 +0000 (d36decc)
@@ -36,8 +36,6 @@ def reconnect(name):
fout = None
def execmd(cmd, fout):
- if not groonga_process:
- reconnect(DEFAULT_DB_NAME)
a = '> ' + cmd + "\n"
stdout.write(a)
stdout.flush()
@@ -60,10 +58,16 @@ def execmd(cmd, fout):
stdout.flush()
break
+processed_files = []
def readfile(fname, outflag):
+ if fname in processed_files:
+ print "skipped processed file: %s" % fname
+ return
if outflag > 32:
print "!!!! INCLUDE DEPTH OVER !!!!"
raise
+ processed_files.append(fname)
+
b = fname.rfind('/')
if b < 0:
rootdir = './'