lib/milkode/cdweb/lib/search_gotoline.rb in milkode-1.0.2 vs lib/milkode/cdweb/lib/search_gotoline.rb in milkode-1.1.0

@@ -21,16 +21,18 @@
     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
+    def initialize(path, params, query, suburl)
+      @path    = path
+      @params  = params
+      @q       = query
+      @page    = params[:page].to_i || 0
+      @offset  = params[:offset].to_i
+      @suburl  = suburl
+      @homeurl = @suburl + "/home/"
 
       # 検索クエリを解析
       @gotolines = Util::parse_gotoline(@q.keywords)
 
       # レコードをピックアップ
@@ -111,11 +113,11 @@
 
       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)
+      url = @homeurl + 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)}
@@ -131,15 +133,9 @@
       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