Changeset 239

Show
Ignore:
Timestamp:
04/24/08 06:53:56 (7 months ago)
Author:
eric.dumin..@gmail.com
Message:

149 examples, 9 failures, 6 pending

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/yet_another_index_structure/lib/picolena/templates/app/models/document.rb

    r238 r239  
    7272  # Useful to know how old a document is, and to which version the cache corresponds. 
    7373  def date 
    74     from_index[:date].sub(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/,'\1-\2-\3 \4:\5:\6') 
     74    from_index[:modified].sub(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/,'\1-\2-\3 \4:\5:\6') 
    7575  end 
    7676   
    7777  def mtime 
    78     from_index[:date].to_i 
     78    from_index[:modified].to_i 
    7979  end 
    8080   
    8181  # Returns language. 
    8282  def lang 
    83     from_index[:lang] 
     83    from_index[:language] 
    8484  end 
    8585   

  • branches/yet_another_index_structure/lib/picolena/templates/app/models/indexer.rb

    r238 r239  
    6767    # Creates it otherwise. 
    6868    def writer 
    69       @@writer ||= Ferret::Index::IndexWriter.new(default_index_writer_params) 
     69      @@writer ||= Ferret::Index::IndexWriter.new(default_index_params) 
    7070    end 
    7171     
    …… 
    9595     
    9696    def default_index_params 
    97       {:path => Picolena::IndexSavePath, :analyzer => Picolena::Analyzer} 
     97      {:path => Picolena::IndexSavePath, :analyzer => Picolena::Analyzer, :field_infos => default_field_infos} 
    9898    end 
    9999     
    …… 
    107107        field_infos.add_field(:modified,           :store => :yes, :index => :untokenized) 
    108108        field_infos.add_field(:probably_unique_id, :store => :no,  :index => :yes) 
    109         field_infos.add_field(:lang,               :store => :yes, :index => :yes) 
     109        field_infos.add_field(:language,           :store => :yes, :index => :yes) 
    110110      end 
    111     end 
    112      
    113     def default_index_writer_params 
    114       default_index_params.merge :field_infos => default_field_infos 
    115111    end 
    116112  end 

  • branches/yet_another_index_structure/lib/picolena/templates/app/models/query.rb

    r177 r239  
    1414       /\b#{:OR.l}\b/=>'OR', 
    1515       /\b#{:NOT.l}\b/=>'NOT', 
     16       /(#{:filename.l}):/=>'filename:', 
    1617       /(#{:filetype.l}):/=>'filetype:', 
    1718       /#{:content.l}:/ => 'content:', 
    18        /#{:date.l}:/ => 'date:', 
     19       /(#{:modified.l}):/ => 'modified:', 
     20       /(#{:language.l}):/ => 'language:', 
    1921       /\b#{:LIKE.l}\s+(\S+)/=>'\1~' 
    2022      } 
    …… 
    2628    # Instantiates a QueryParser once, and keeps it in cache. 
    2729    def parser 
    28       @@parser ||= Ferret::QueryParser.new(:fields => [:content, :file, :basename, :filetype, :date], :or_default => false, :analyzer=>Picolena::Analyzer) 
     30      @@parser ||= Ferret::QueryParser.new(:fields => [:content, :filename, :basename, :filetype, :modified], :or_default => false, :analyzer=>Picolena::Analyzer) 
    2931    end 
    3032  end 

  • branches/yet_another_index_structure/lib/picolena/templates/lang/ui/de.yml

    r128 r239  
    2020 
    2121## Fields 
     22filename: filename|file|datei 
    2223filetype: erweiterung|ext 
    2324content: inhalt 
    24 date: jahr|zeit 
     25modified: jahr|zeit|geÀndert 
     26language: lang|sprache 

  • branches/yet_another_index_structure/lib/picolena/templates/lang/ui/en.yml

    r128 r239  
    2020 
    2121## Fields 
     22filename: filename|file 
    2223filetype: filetype|ext 
    2324content: content 
    24 date: year|date 
     25modified: year|date|modified 
     26language: lang|language 

  • branches/yet_another_index_structure/lib/picolena/templates/lang/ui/es.yml

    r128 r239  
    2020 
    2121## Fields 
     22filename: filename|file|archivo 
    2223filetype: extensión|ext 
    2324content: contenido 
    24 date: fecha|año|anho 
     25modified: fecha|año|anho|modificado 
     26language: lang|idioma 

  • branches/yet_another_index_structure/lib/picolena/templates/lang/ui/fr.yml

    r128 r239  
    2020 
    2121## Fields 
     22filename: filename|file|fichier 
    2223filetype: extension|ext 
    2324content: contenu 
    24 date: année|date|annee 
     25modified: année|date|annee|modifie 
     26language: lang|langue 

  • branches/yet_another_index_structure/lib/picolena/templates/spec/models/basic_finder_spec.rb

    r238 r239  
    3636fields={ 
    3737  # description => key 
    38   :content=>:content, 
    39   :basename=>:basename, 
    40   :filename=>:file, 
    41   :extension => :filetype, 
    42   :modification_time=>:date 
     38  :content            => :content, 
     39  :complete_path      => :complete_path, 
     40  :basename           => :basename, 
     41  :filename           => :filename, 
     42  :extension          => :filetype, 
     43  :modification_time  => :modified, 
     44  :probably_unique_id => :probably_unique_id, 
     45  :language           => :language 
    4346} 
    4447 

  • branches/yet_another_index_structure/lib/picolena/templates/spec/models/finder_spec.rb

    r238 r239  
    3131  end 
    3232   
    33   it "should find documents according to their filename when specified with file:query" do 
    34     Finder.new("file:crossed.text").matching_documents.collect{|d| d.content}.should include("txt inside!") 
     33  it "should find documents according to their filename when specified with file:query or filename:query" do 
     34    Finder.new("filename:crossed.text").matching_documents.collect{|d| d.content}.should include("txt inside!") 
    3535    Finder.new("file:crossed.txt").matching_documents.collect{|d| d.content}.should include("text inside!") 
    3636  end