milkode 0.8.1 → 0.9.0

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

@@ -16,6 +16,8 @@ module Milkode
                ['package',  'p'],
                ['filepath', 'fpath', 'f'],
                ['suffix',   's'],
+               ['fp'],          # fpath or package
+               ['keyword',  'k'],
               ]
 
     def initialize(str)
@@ -29,7 +31,7 @@ module Milkode
     end
 
     def empty?
-      keywords.size == 0 && packages.size == 0 && fpaths.size == 0 && suffixs.size == 0
+      keywords.size == 0 && packages.size == 0 && fpaths.size == 0 && suffixs.size == 0 && fpath_or_packages.size == 0
     end
 
     def keywords
@@ -48,6 +50,39 @@ module Milkode
       calc_param(2)
     end
 
+    def fpath_or_packages
+      calc_param(3)
+    end
+
+    def multi_match_keywords
+      # 本当はkeywordsにしたかった・・
+      calc_param(4)
+    end
+
+    def conv_keywords_to_fpath
+      s = query_string.split.map {|v|
+        if keywords.include? v
+          "f:#{v}"
+        else
+          v
+        end
+      }.join(' ')
+
+      Query.new(s)
+    end
+
+    def conv_keywords_to_fpath_or_packages
+      s = query_string.split.map {|v|
+        if keywords.include? v
+          "fp:#{v}"
+        else
+          v
+        end
+      }.join(' ')
+
+      Query.new(s)
+    end
+
     private
 
     def calc_param(index)

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

@@ -20,11 +20,9 @@ module Milkode
     LIMIT_NUM = 50             # 最大検索ファイル数
     NTH = 3                    # 表示範囲
     COL_LIMIT = 200            # 1行の桁制限
-    
-#     DISP_NUM = 1000              # 1ページの表示数
-#     LIMIT_NUM = 1000             # 最大検索ファイル数
-#     NTH = 3                      # 表示範囲
-#     COL_LIMIT = 200              # 1行の桁制限
+
+    MATH_FILE_DISP  = 3        # マッチファイルの最大表示数
+    MATH_FILE_LIMIT = MATH_FILE_DISP + 1 # マッチファイルの検索リミット数
     
     def initialize(path, params, query)
       @path = path
@@ -33,8 +31,24 @@ module Milkode
       @page = params[:page].to_i || 0
       @offset = params[:offset].to_i
       @line = params[:line].to_i
-      @is_onematch = params[:onematch]
-      @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.packages, path, @q.fpaths, @q.suffixs, @offset, LIMIT_NUM)
+      @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)
+
+      # マッチするファイル
+      @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)
+        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)
+        end
+      end
+
       grep_contents
     end
 
@@ -70,7 +84,28 @@ module Milkode
         # g << [m]
       end
       
-      match_groups.map{|g|result_match_record(g)}.join
+      <<EOF
+#{match_files_contents}
+#{match_groups.map{|g|result_match_record(g)}.join}
+EOF
+    end
+
+    def match_files_contents
+      unless @match_files.empty?
+        is_and_more = @match_files.size >= MATH_FILE_LIMIT
+        @match_files = @match_files[0..MATH_FILE_DISP-1]
+        conv_query = (@path != "") ? @q.conv_keywords_to_fpath : @q.conv_keywords_to_fpath_or_packages
+        tmpp = @params.clone
+        tmpp[:query] = conv_query.query_string
+        url = Mkurl.new(@path, tmpp).inherit_query_shead
+        <<EOF
+#{@match_files.map {|record| result_record(DocumentRecord.new(record))}.join}
+#{"<a href='#{url}'>...and more</a></a>" if is_and_more}
+<hr>
+EOF
+      else
+        ""
+      end
     end
     
     def html_pagination
@@ -78,7 +113,7 @@ module Milkode
       return "" if next_offset >= @total_records
 
       return <<EOF
-<div class='pagination'>
+<div class='pagination pagination-centered'>
 #{pagination_link(next_offset, @next_line, "next >>")}
 </div>
 EOF
@@ -102,7 +137,7 @@ EOF
 
           if @is_onematch
             grep = Grep.new(record.content)
-            match_line = grep.one_match_and(@q.keywords)
+            match_line = grep.one_match_and(@q.keywords, @is_sensitive)
             @match_records << MatchRecord.new(record, match_line) if match_line
 
             if @match_records.size >= DISP_NUM
@@ -127,7 +162,7 @@ EOF
 
     def grep_match_lines_stopover(record, index)
       grep = Grep.new(record.content)      
-      r = grep.match_lines_stopover(@q.keywords, DISP_NUM - @match_records.size, (index == 0) ? @line : 0)
+      r = grep.match_lines_stopover(@q.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
@@ -170,7 +205,7 @@ EOS
     end
 
     def pagination_link(offset, line, label)
-      tmpp = @params
+      tmpp = @params.clone
       tmpp[:offset] = offset.to_s
       tmpp[:line] = line.to_s
       href = Mkurl.new("", tmpp).inherit_query_shead_offset
@@ -178,7 +213,13 @@ EOS
     end
 
     def pagination_span(content)
-      "<span class='pagination-link'>#{content}</span>\n"
+      "<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)     # 

data/lib/milkode/cdweb/lib/search_files.rb

@@ -27,7 +27,7 @@ module Milkode
       if (@q.fpaths.include?("*"))
         @records, @total_records = Database.instance.selectAll(@offset, DISP_NUM)
       else
-        @records, @total_records = Database.instance.search(@q.keywords, @q.packages, path, @q.fpaths, @q.suffixs, @offset, DISP_NUM)
+        @records, @total_records = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, DISP_NUM)
       end
     end
 
@@ -49,10 +49,10 @@ module Milkode
     
     def html_pagination
       return "" if @q.empty?
-      return "" if next_offset >= @total_records
+      return "" if @total_records < DISP_NUM
       
       return <<EOF
-<div class='pagination'>
+<div class='pagination pagination-centered'>
 #{pagination_link(next_offset, "next >>")}
 </div>
 EOF
@@ -72,7 +72,7 @@ EOF
     end
 
     def pagination_span(content)
-      "<span class='pagination-link'>#{content}</span>\n"
+      "<ul><li>#{content}</li></ul>\n"
     end
 
     def result_record(record)

data/lib/milkode/cdweb/lib/search_gotoline.rb

@@ -0,0 +1,151 @@
+# -*- 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 SearchGotoLine
+    attr_reader :total_records
+    attr_reader :page
+    
+    DISP_NUM = 20              # 1ページの表示数
+    LIMIT_NUM = 50             # 最大検索ファイル数
+    NTH = 3                    # 表示範囲
+    COL_LIMIT = 200            # 1行の桁制限
+
+    MATH_FILE_DISP  = 3        # マッチファイルの最大表示数
+    MATH_FILE_LIMIT = MATH_FILE_DISP + 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.keywords)
+
+      # レコードをピックアップ
+      @records = []
+      @gotolines.each do |v|
+        @records << Database.instance.record(v[0][0][1..-1])
+      end
+      @total_records = @records.size
+
+      # 検索結果を表示
+      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
+
+    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|
+        @match_records << MatchRecord.new(record, Grep::MatchLineResult.new(@gotolines[index][1] - 1, nil))
+
+        if @match_records.size >= DISP_NUM
+          @end_index = index
+          @next_index = index + 1
+          break
+        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.line_number_start}"}'>#{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
+
+

data/lib/milkode/cdweb/public/css/coderay-patch.css

@@ -8,3 +8,27 @@
 .anchor-table td { border: 1px solid silver; font-size:13px; }
 .anchor-table a { color: #000000; text-decoration:none; }
 .anchor-table a:hover { text-decoration:underline; background-color: #F0F0F0; }
+
+/* code */
+.CodeRay .line-numbers { background-color: #F5F5F5; }
+.CodeRay .line-numbers a { background-color: #F5F5F5 !important; }
+
+table.CodeRay td {
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.CodeRay .line-numbers pre {
+    border-style: none;
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+td.code pre {
+    background-color: #ffffff;
+    white-space: pre;
+    word-wrap: normal;
+    overflow: auto;
+}
+
+

data/lib/milkode/cdweb/public/css/milkode.css

@@ -8,8 +8,10 @@ div.footer {
 }
 
 div.search-summary {
-    border-color: #e92926;
-    background-color:#FFF0F0;
+    /* border-color: #e92926; */
+    /* background-color:#FFF0F0; */
+    border-color: #C0C0C0;
+    background-color: #FAFAFA;
     border-top-style:solid;
     border-top-width:1px;
     border-bottom-style:solid;
@@ -30,11 +32,13 @@ dt.result-file {
 }
 
 div.pagination {
-    border-color: #e92926;
-    background-color:#FFF0F0;
+    /* border-color: #e92926; */
+    /* background-color:#FFF0F0; */
+    border-color: #C0C0C0;
+    background-color: #FBFBFB;
     border-top-style:solid;
     border-top-width:1px;
-    text-align: center;
+    /* text-align: center; */
     margin-bottom: 20px;
 }
 
@@ -89,6 +93,14 @@ ul.unstyled_margin {
     margin-left: 7px;
 }
 
+select#shead {
+    width: 120px;
+}
+
+select#package {
+    width: 160px;
+}
+
 /* toppage */
 
 #toppage {
@@ -123,3 +135,25 @@ ul.unstyled_margin {
 #toppage .footer {
 }
 
+/* mainpage */
+
+#mainpage {
+    margin-left: 20px;
+    margin-right: 20px;
+    font-size: 14px;
+}
+
+#mainpage .header {
+    margin-top: 20px;
+}
+
+#mainpage .search_form {
+    margin-top: 15px;
+}
+
+/* mainpage - help */
+
+#mainpage .sample-code {
+    margin-top: 20px;
+}
+