redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xapian not indexing files/project #388

Browse Source
This commit is contained in:
Karel Pičman 2015-05-15 10:46:13 +02:00
parent 625912c6f8
commit 6ee086548d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/models/dmsf_file.rb
View File

@ -81,11 +81,19 @@ class DmsfFile < ActiveRecord::Base
existing_file.nil? || existing_file.id == self.id
end
acts_as_event :title => Proc.new {|o| "#{o.title} - #{o.name}"},
:description => Proc.new {|o| o.description },
:url => Proc.new {|o| {:controller => 'dmsf_files', :action => 'show', :id => o}},
:datetime => Proc.new {|o| o.updated_at },
:author => Proc.new {|o| o.last_revision.user }
acts_as_event :title => Proc.new { |o| o.name },
:description => Proc.new { |o|
desc = Redmine::Search.cache_store.fetch("DmsfFile-#{o.id}")
if desc
Redmine::Search.cache_store.delete("DmsfFile-#{o.id}")
desc
else
o.description
end
},
:url => Proc.new { |o| {:controller => 'dmsf_files', :action => 'show', :id => o} },
:datetime => Proc.new { |o| o.updated_at },
:author => Proc.new { |o| o.last_revision.user }
acts_as_searchable :columns => ["#{table_name}.name", "#{DmsfFileRevision}.title", "#{DmsfFileRevision}.description"],
:project_key => 'project_id',
@ -177,7 +185,7 @@ class DmsfFile < ActiveRecord::Base
end
def description
self.last_revision ? self.last_revision.description : ''
self.last_revision ? self.last_revision.description : ''
end
def version
@ -394,9 +402,9 @@ class DmsfFile < ActiveRecord::Base
end
if user.allowed_to?(:view_dmsf_files, dmsf_file.project) &&
(project_ids.empty? || (project_ids.include?(dmsf_file.project.id)))
# TODO: It works no more :-(
#dmsf_file.last_revision.description = dochash['sample'].force_encoding('UTF-8') if dochash['sample']
(project_ids.empty? || (project_ids.include?(dmsf_file.project.id)))
Redmine::Search.cache_store.write("DmsfFile-#{dmsf_file.id}",
dochash['sample'].force_encoding('UTF-8')) if dochash['sample']
results << dmsf_file
end
end