milkode 0.9.5 → 0.9.6

data/lib/milkode/cdweb/lib/database.rb

@@ -88,20 +88,23 @@ module Milkode
 
       # 検索
       result, total_records = [], 0
-      
-      unless is_not_search
-        result, total_records = @documents.search_with_match(
-          :patterns  => patterns,
-          :keywords  => keywords,
-          :paths     => paths,
-          :packages  => packages,
-          :strict_packages  => strict_packages,
-          :restpaths => fpaths,
-          :suffixs   => suffixs,
-          :fpath_or_packages => fpath_or_packages,
-          :offset    => offset,
-          :limit     => limit
-        )
+
+      begin
+        unless is_not_search
+          result, total_records = @documents.search_with_match(
+            :patterns  => patterns,
+            :keywords  => keywords,
+            :paths     => paths,
+            :packages  => packages,
+            :strict_packages  => strict_packages,
+            :restpaths => fpaths,
+            :suffixs   => suffixs,
+            :fpath_or_packages => fpath_or_packages,
+            :offset    => offset,
+            :limit     => limit
+          )
+        end
+      rescue Groonga::TooLargeOffset
       end
 
       # 結果
@@ -198,8 +201,9 @@ module Milkode
     def update_in(package)
       updater = Updater.new(@grndb, package.name)
       updater.set_package_ignore IgnoreSetting.new("/", package.ignore)
-      updater.enable_no_auto_ignore       if package.options[:no_auto_ignore]
-      updater.enable_update_with_git_pull if package.options[:update_with_git_pull]
+      updater.enable_no_auto_ignore         if package.options[:no_auto_ignore]
+      updater.enable_update_with_git_pull   if package.options[:update_with_git_pull]
+      updater.enable_update_with_svn_update if package.options[:update_with_svn_update]
       updater.exec
       updater.result
     end

data/lib/milkode/cdweb/lib/grep.rb

@@ -17,7 +17,7 @@ module Milkode
 
     def match_lines_stopover(patterns, max_match, start_index, is_sensitive)
       result = []
-      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
+      patternRegexps = strs2regs(patterns, is_sensitive)
       index = start_index
 
       lines = @content.split($/)
@@ -45,7 +45,7 @@ module Milkode
     
     def match_lines_and(patterns, is_sensitive)
       result = []
-      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
+      patternRegexps = strs2regs(patterns, is_sensitive)
       index = 0
       
       @content.each_line do |line|
@@ -63,7 +63,7 @@ module Milkode
     end
 
     def one_match_and(patterns, is_sensitive)
-      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
+      patternRegexps = strs2regs(patterns, is_sensitive)
       index = 0
       
       @content.each_line do |line|
@@ -82,13 +82,13 @@ module Milkode
 
     private
     
-    def strs2regs(strs, ignore = false)
+    def strs2regs(strs, is_sensitive)
       regs = []
 
       strs.each do |v|
         option = 0
-        option |= Regexp::IGNORECASE if (ignore)
-        regs << Regexp.new(Regexp.escape(v), option)
+        option |= Regexp::IGNORECASE if (!is_sensitive && Util::downcase?(v))
+        regs   << Regexp.new(Regexp.escape(v), option)
       end
 
       regs

data/lib/milkode/cdweb/lib/query.rb

@@ -18,6 +18,7 @@ module Milkode
                ['suffix',   's'],
                ['fp'],          # fpath or package
                ['keyword',  'k'],
+               ['gotoline', 'g'],
               ]
 
     def initialize(str)
@@ -31,7 +32,11 @@ module Milkode
     end
 
     def empty?
-      keywords.size == 0 && packages.size == 0 && fpaths.size == 0 && suffixs.size == 0 && fpath_or_packages.size == 0
+      keywords.size == 0 && packages.size == 0 && fpaths.size == 0 && suffixs.size == 0 && fpath_or_packages.size == 0 && gotolines.size == 0
+    end
+
+    def only_keywords
+      packages.size == 0 && fpaths.size == 0 && suffixs.size == 0 && fpath_or_packages.size == 0 && gotolines.size == 0
     end
 
     def keywords
@@ -59,6 +64,10 @@ module Milkode
       calc_param(4)
     end
 
+    def gotolines
+      calc_param(5)
+    end
+
     def conv_keywords_to_fpath
       s = query_string.split.map {|v|
         if keywords.include? v
@@ -83,6 +92,32 @@ module Milkode
       Query.new(s)
     end
 
+    # 'name def test' -> 'fp:name def test'
+    def conv_head_keyword_to_fpath_or_packages
+      s = query_string.split.map {|v|
+        if keywords[0].include? v
+          "fp:#{v}"
+        else
+          v
+        end
+      }.join(' ')
+
+      Query.new(s)
+    end
+
+    # 'cdstk.rb:11' -> 'g:cdstk.rb:11'
+    def conv_fuzzy_gotoline
+      s = query_string.split.map {|v|
+        if keywords[0].include? v
+          "g:#{v}"
+        else
+          v
+        end
+      }.join(' ')
+
+      Query.new(s)
+    end
+
     private
 
     def calc_param(index)

data/lib/milkode/cdweb/lib/search_contents.rb

@@ -9,11 +9,11 @@ require 'milkode/cdweb/lib/query'
 require 'milkode/cdweb/lib/grep'
 require 'milkode/cdweb/lib/mkurl'
 require 'milkode/common/util'
+require 'milkode/cdweb/lib/search_fuzzy_gotoline'
 
 module Milkode
   class SearchContents
     attr_reader :total_records
-    attr_reader :elapsed
     attr_reader :page
     
     DISP_NUM = 20              # 1ページの表示数
@@ -23,7 +23,7 @@ module Milkode
 
     MATH_FILE_DISP  = 3        # マッチファイルの最大表示数
     MATH_FILE_LIMIT = MATH_FILE_DISP + 1 # マッチファイルの検索リミット数
-    
+
     def initialize(path, params, query)
       @path = path
       @params = params
@@ -33,23 +33,48 @@ module Milkode
       @line = params[:line].to_i
       @is_onematch = params[:onematch] == 'on'
       @is_sensitive = params[:sensitive] == 'on'
-
-      # メインの検索
-      @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, LIMIT_NUM)
-
-      # マッチするファイル
+      @searcher_fuzzy_gotoline = nil
+
+      # 検索1 : クエリーそのまま
+      @records, @total_records = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, LIMIT_NUM)
+      grep_contents(@q.keywords)
+
+      # 検索2 : マッチしなかった時におすすめクエリーがある場合
+      if @match_records.empty?
+        if recommended_fuzzy_gotoline?
+          # 専用の Searcher を作成
+          @searcher_fuzzy_gotoline = SearchFuzzyGotoLine.new(@path, @params, @q)
+
+          # 結果をコピーする
+          @total_records = @searcher_fuzzy_gotoline.total_records
+          @match_records = @searcher_fuzzy_gotoline.match_records
+          @next_index    = @searcher_fuzzy_gotoline.next_index
+          @end_index     = @searcher_fuzzy_gotoline.end_index
+          @next_line     = nil
+          
+        elsif recommended_fpath_or_packages?
+          # おすすめクエリーに変換
+          q2 = @q.conv_head_keyword_to_fpath_or_packages
+          
+          # 検索
+          @records, @total_records = Database.instance.search(q2.keywords, q2.multi_match_keywords, q2.packages, path, q2.fpaths, q2.suffixs, q2.fpath_or_packages, @offset, LIMIT_NUM)
+          
+          # 再grep
+          grep_contents(q2.keywords)
+        end
+      end
+      
+      # 検索3 : マッチするファイル
       @match_files = []
       if @offset == 0 && @line == 0
         t = 0
 
         if (@path != "")
-          @match_files, t, @elapsed = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, @q.fpaths + @q.keywords, @q.suffixs, @q.fpath_or_packages, @offset, MATH_FILE_LIMIT)
+          @match_files, t = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, @q.fpaths + @q.keywords, @q.suffixs, @q.fpath_or_packages, @offset, MATH_FILE_LIMIT)
         else
-          @match_files, t, @elapsed = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages + @q.keywords, @offset, MATH_FILE_LIMIT)
+          @match_files, t = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages + @q.keywords, @offset, MATH_FILE_LIMIT)
         end
       end
-
-      grep_contents
     end
 
     def query
@@ -85,11 +110,59 @@ module Milkode
       end
       
       <<EOF
-#{match_files_contents}
+#{recommended_contents}
 #{match_groups.map{|g|result_match_record(g)}.join}
 EOF
     end
 
+    def recommended_contents
+      contents = []
+
+      str = recommended_query_contents
+      contents << str unless str.empty?
+
+      str = match_files_contents
+      contents << str unless str.empty?
+
+      unless contents.empty?
+        contents.join
+      else
+        ""
+      end
+    end
+
+    def recommended_fuzzy_gotoline?
+      @q.keywords.size == 1 && @q.only_keywords && Util::fuzzy_gotoline_keyword?(@q.keywords[0])
+    end
+
+    def recommended_fpath_or_packages?
+      @q.keywords.size >= 2 && @q.only_keywords
+    end
+
+    def recommended_query_contents
+      if recommended_fuzzy_gotoline?
+        conv_query   = @q.conv_fuzzy_gotoline
+        tmpp         = @params.clone
+        tmpp[:query] = conv_query.query_string
+        url          = Mkurl.new(@path, tmpp).inherit_query_shead
+        <<EOS
+<dt class='result-file'>#{img_icon('document-new-4.png')}<a href='#{url}'>#{conv_query.query_string}</a></dt>
+<hr>
+EOS
+      elsif recommended_fpath_or_packages?
+        conv_query   = @q.conv_head_keyword_to_fpath_or_packages
+        tmpp         = @params.clone
+        tmpp[:query] = conv_query.query_string
+        url          = Mkurl.new(@path, tmpp).inherit_query_shead
+        <<EOS
+<dt class='result-file'>#{img_icon('document-new-4.png')}<a href='#{url}'>#{conv_query.query_string}</a></dt>
+<hr>
+EOS
+      else
+        ""
+      end
+  end
+    
     def match_files_contents
       unless @match_files.empty?
         is_and_more = @match_files.size >= MATH_FILE_LIMIT
@@ -107,7 +180,7 @@ EOF
         ""
       end
     end
-    
+
     def html_pagination
       return "" if @q.empty?
       return "" if next_offset >= @total_records
@@ -123,11 +196,19 @@ EOF
       @match_records.size
     end
 
+    def directjump?
+      @searcher_fuzzy_gotoline && @searcher_fuzzy_gotoline.directjump?
+    end
+
+    def directjump_url
+      @searcher_fuzzy_gotoline.directjump_url
+    end
+
     private
 
     MatchRecord = Struct.new(:record, :match_line)
 
-    def grep_contents
+    def grep_contents(keywords)
       @match_records = []
       @end_index = @next_index = @records.size
       @next_line = nil
@@ -137,7 +218,7 @@ EOF
 
           if @is_onematch
             grep = Grep.new(record.content)
-            match_line = grep.one_match_and(@q.keywords, @is_sensitive)
+            match_line = grep.one_match_and(keywords, @is_sensitive)
             @match_records << MatchRecord.new(record, match_line) if match_line
 
             if @match_records.size >= DISP_NUM
@@ -146,7 +227,7 @@ EOF
               break
             end
           else
-            break if grep_match_lines_stopover(record, index)
+            break if grep_match_lines_stopover(record, index, keywords)
           end
         else
           @match_records << MatchRecord.new(record, Grep::MatchLineResult.new(0, nil))
@@ -160,9 +241,9 @@ EOF
       end
     end
 
-    def grep_match_lines_stopover(record, index)
+    def grep_match_lines_stopover(record, index, keywords)
       grep = Grep.new(record.content)      
-      r = grep.match_lines_stopover(@q.keywords, DISP_NUM - @match_records.size, (index == 0) ? @line : 0, @is_sensitive)
+      r = grep.match_lines_stopover(keywords, DISP_NUM - @match_records.size, (index == 0) ? @line : 0, @is_sensitive)
 
       r[:result].each do |match_line|
         @match_records << MatchRecord.new(record, match_line) if match_line
@@ -197,7 +278,7 @@ EOF
       url = "/home/" + record_link(record)
       
       <<EOS
-    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a>#{result_refinement(record)}</dt>
     <dd>
 #{coderay.to_html_anchorlink(url)}
     </dd>
@@ -226,6 +307,40 @@ EOS
       Mkurl.new(record.shortpath, @params).inherit_query_shead
     end
 
+    def refinement_suffix(suffix)
+      params = @params.clone
+      params[:query] = [@params[:query], "s:#{suffix}"].join(" ")
+      "/home/" + Mkurl.new(@path, params).inherit_query_shead
+    end
+
+    def refinement_directory(path)
+      "/home/" + Mkurl.new(path, @params).inherit_query_shead
+    end
+
+    def result_refinement(record)
+      refinements = []
+
+      # 拡張子で絞り込み
+      refinements << "<a href='#{refinement_suffix(record.suffix)}'>.#{record.suffix}で絞り込み</a>" if record.suffix
+
+      # ディレクトリで絞り込み
+      path    = Util::relative_path(record.shortpath, @path)
+      dirname = path.to_s.split('/')[-2]
+      refinements << "<a href='#{refinement_directory(record.shortpath + '/..')}'>#{dirname}/以下で再検索</a>" if dirname
+
+      unless refinements.empty?
+        space1            = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
+        space2            = '&nbsp;&nbsp;,&nbsp;&nbsp;'
+
+        <<EOF
+#{space1}<span id="result-refinement">[#{refinements.join(space2)}]</span>
+EOF
+      else
+        ''
+      end
+
+    end
+
   end
 end
 

data/lib/milkode/cdweb/lib/search_fuzzy_gotoline.rb

@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief  曖昧ジャンプ
+# @author ongaeshi
+# @date   2012/07/08
+
+require 'milkode/cdweb/lib/query'
+require 'milkode/cdweb/lib/grep'
+require 'milkode/cdweb/lib/mkurl'
+require 'milkode/common/util'
+
+module Milkode
+  class SearchFuzzyGotoLine
+    attr_reader :total_records
+    attr_reader :match_records
+    attr_reader :next_index
+    attr_reader :end_index
+    
+    DISP_NUM = 20              # 1ページの表示数
+    LIMIT_NUM = 50             # 最大検索ファイル数
+    NTH = 3                    # 表示範囲
+    COL_LIMIT = 200            # 1行の桁制限
+
+    def initialize(path, params, query)
+      @path = path
+      @params = params
+      @q = query
+      @page = params[:page].to_i || 0
+      @offset = params[:offset].to_i
+
+      # 検索クエリを解析
+      gotolines = Util::parse_gotoline(@q.gotolines + @q.keywords)
+      @gotoline = gotolines[0]
+
+      # 検索
+      fpaths = @q.fpaths + @gotoline[0]
+      @records, @total_records = Database.instance.search([], @q.multi_match_keywords, @q.packages, path, fpaths, @q.suffixs, @q.fpath_or_packages, @offset, LIMIT_NUM)
+
+      # 検索結果を表示
+      grep_contents
+    end
+
+    def query
+      @q.query_string
+    end
+
+    def next_offset
+      @offset + @next_index
+    end
+
+    def data_range
+      @offset..(@offset + @end_index)
+    end
+
+    def html_contents
+      match_groups = @match_records.reduce([]) do |g, m|
+        # 近接マッチ無効
+        g << [m]
+      end
+      
+      <<EOF
+#{match_groups.map{|g|result_match_record(g)}.join}
+EOF
+    end
+
+    def html_pagination
+      return "" if @q.empty?
+      return "" if next_offset >= @total_records
+
+      return <<EOF
+<div class='pagination pagination-centered'>
+#{pagination_link(next_offset, @next_line, "next >>")}
+</div>
+EOF
+    end
+
+    def match_num
+      @match_records.size
+    end
+
+    def directjump?
+      match_num == 1
+    end
+
+    def directjump_url
+      path   = File.join('/home', @match_records[0].record.shortpath)
+      lineno = "#n#{@gotoline[1]}"
+      Mkurl.new(path, @params).inherit_query_shead + lineno
+    end
+
+    private
+
+    MatchRecord = Struct.new(:record, :match_line)
+
+    def grep_contents
+      @match_records = []
+      @end_index = @next_index = @records.size
+      @next_line = nil
+
+      @records.each_with_index do |record, index|
+        lineidx = @gotoline[1] - 1
+        
+        if (lineidx < record.content.split("\n").size)
+          @match_records << MatchRecord.new(record, Grep::MatchLineResult.new(lineidx, nil))
+
+          if @match_records.size >= DISP_NUM
+            @end_index  = index
+            @next_index = index + 1
+            break
+          end
+        end
+      end
+    end
+
+    def result_match_record(match_group)
+      record = match_group[0].record
+
+      first_index = match_group[0].match_line.index - NTH
+      last_index  = match_group[-1].match_line.index + NTH
+      match_lines = match_group.map{|m| m.match_line}
+
+      coderay = CodeRayWrapper.new(record.content, record.shortpath, match_lines)
+      coderay.col_limit(COL_LIMIT)
+      coderay.set_range(first_index..last_index)
+
+      url = "/home/" + record_link(record)
+      
+      <<EOS
+    <dt class='result-record'><a href='#{url + "#n#{coderay.highlight_lines[0]}"}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+    <dd>
+#{coderay.to_html_anchorlink(url)}
+    </dd>
+EOS
+    end
+
+    def pagination_link(offset, line, label)
+      tmpp = @params.clone
+      tmpp[:offset] = offset.to_s
+      tmpp[:line] = line.to_s
+      href = Mkurl.new("", tmpp).inherit_query_shead_offset
+      pagination_span("<a href='#{href}' rel='next'>#{label}</a>")
+    end
+
+    def pagination_span(content)
+      "<ul><li>#{content}</li></ul>\n"
+    end
+
+    def result_record(record)
+      <<EOS
+    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{Util::relative_path record.shortpath, @path}</a></dt>
+EOS
+    end
+
+    def record_link(record)
+      Mkurl.new(record.shortpath, @params).inherit_query_shead
+    end
+
+  end
+end
+
+