finder.rb in picolena-0.1.8

- old
+ new

@@ -1,26 +1,27 @@
 class Finder
   attr_reader :query
 
   def index
-    @@index ||= Indexer.index
+    @@index ||= Indexer.index 
   end
 
-  def initialize(raw_query,by_date=false, page=1,results_per_page=Picolena::ResultsPerPage)
+  def initialize(raw_query,sort_by='relevance', page=1,results_per_page=Picolena::ResultsPerPage)
     @query = Query.extract_from(raw_query)
     @raw_query= raw_query
     Indexer.ensure_index_existence
+    reload_index! if should_be_reloaded?
     @per_page=results_per_page
     @offset=(page.to_i-1)*results_per_page
-    @by_date=by_date
+    @sort_by=sort_by
     index_should_have_documents
   end
 
   def execute!
     @matching_documents=[]
     start=Time.now
-      @total_hits = index.search_each(query, :limit => @per_page, :offset=>@offset, :sort => (sort_by_date if @by_date)){|index_id, score|
+      @total_hits = index.search_each(query, :limit => @per_page, :offset=>@offset, :sort => (sort_by_date if @sort_by=='date')){|index_id, score|
         begin
           found_doc=Document.new(index[index_id][:complete_path])
           found_doc.matching_content=index.highlight(query, index_id,
                                                      :field => :content, :excerpt_length => 80,
                                                      :pre_tag => "<<", :post_tag => ">>"
@@ -50,19 +51,29 @@
       execute! unless executed?
       instance_variable_get("@#{attribute_name}")
     }
   }
 
-  def self.reload!
+  private
+  
+  def reload_index!
+    Indexer.close
     @@index = nil
+    @@last_reload = Time.now
   end
 
-  private
+  def should_be_reloaded?
+    Indexer.reload_file_mtime > last_reload
+  end
+ 
+  def last_reload
+    @@last_reload ||= Time.at(0)
+  end
   
   def sort_by_date
     Ferret::Search::SortField.new(:modified, :type => :byte, :reverse => true)
   end
 
   def index_should_have_documents
     raise IndexError, "no document found" unless index.size > 0
   end
-end
\ No newline at end of file
+end