<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">YUKI Hiroshi <shimo****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2014-06-28 02:56:01 +0900 (Sat, 28 Jun 2014)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09">473c07aea16be13481fe645f6461310f606c0d09</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Show default base dir</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#diff-0">bin/droonga-engine-join</a></li>
<li><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#diff-1">bin/droonga-engine-unjoin</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: bin/droonga-engine-join (+4 -3)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L30">30</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L33">33</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L37">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L40">40</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L41">41</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L44">44</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L66">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L67">67</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L68">68</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L69">69</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L70">70</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L71">71</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L72">72</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L73">73</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0L74">74</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R30">30</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R34">34</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R38">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R40">40</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R41">41</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R42">42</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R46">46</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R68">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R69">69</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R70">70</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R71">71</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R72">72</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R73">73</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R74">74</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L0R75">75</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -28,6 +28,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">require "droonga/data_absorber"</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> require "droonga/serf"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options = OpenStruct.new</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.dataset = "Default"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.port = 10031</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.tag = "droonga"</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -38,7 +39,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">parser = OptionParser.new</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.version = Droonga::Engine::VERSION</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.on("--base-dir=PATH",</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- "Path to the base directory the catalog.json is located in.") do |path|</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "Path to the base directory the catalog.json is located in.",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "(#{options.base_dir})") do |path|</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.base_dir = path</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> end</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -67,8 +69,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">end</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.parse!(ARGV)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-base_dir = Pathname(base_dir).expand_path</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+base_dir = Pathname(options.base_dir).expand_path</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> catalog_path = Droonga::Path.base + "catalog.json"</span>
</pre>
</td>
</tr>
</tbody>
</table>
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: bin/droonga-engine-unjoin (+4 -3)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L30">30</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L33">33</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L36">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L39">39</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L40">40</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L41">41</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L43">43</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L50">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L51">51</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L52">52</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L53">53</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L54">54</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L55">55</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L56">56</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L57">57</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1L58">58</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R30">30</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R34">34</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R37">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R40">40</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R41">41</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R45">45</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R52">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R53">53</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R54">54</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R55">55</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R56">56</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R57">57</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R58">58</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09#L1R59">59</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -28,6 +28,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">require "droonga/data_absorber"</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> require "droonga/serf"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options = OpenStruct.new</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.dataset = "Default"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.port = 10031</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.tag = "droonga"</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -37,7 +38,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">parser = OptionParser.new</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.version = Droonga::Engine::VERSION</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.on("--base-dir=PATH",</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- "Path to the base directory the catalog.json is located in.") do |path|</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "Path to the base directory the catalog.json is located in.",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "(#{options.base_dir})") do |path|</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.base_dir = path</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> end</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -51,8 +53,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">end</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> parser.parse!(ARGV)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-base_dir = Pathname(base_dir).expand_path</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+base_dir = Pathname(options.base_dir).expand_path</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> catalog_path = Droonga::Path.base + "catalog.json"</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>