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 09:11:48 +02:00
parent cc365c9af4
commit 625912c6f8
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/models/dmsf_file.rb
View File

@ -295,7 +295,8 @@ class DmsfFile < ActiveRecord::Base
# To fulfill searchable module expectations # To fulfill searchable module expectations
def self.search(tokens, user, projects = nil, options = {}) def self.search(tokens, user, projects = nil, options = {})
tokens = [] << tokens unless tokens.is_a?(Array) tokens = [] << tokens unless tokens.is_a?(Array)
projects = [] << projects unless projects.nil? || projects.is_a?(Array) projects = [] << projects if projects.is_a?(Project)
project_ids = projects.collect(&:id) if projects
find_options = {} find_options = {}
limit_options = {} limit_options = {}
@ -316,13 +317,13 @@ class DmsfFile < ActiveRecord::Base
find_options[:conditions] = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort] find_options[:conditions] = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort]
project_conditions = [] project_conditions = []
project_conditions << Project.allowed_to_condition(user, :view_dmsf_files) project_conditions << Project.allowed_to_condition(user, :view_dmsf_files)
project_conditions << "#{DmsfFile.table_name}.project_id IN (#{projects.collect(&:id).join(',')})" unless projects.nil? project_conditions << "#{DmsfFile.table_name}.project_id IN (#{project_ids.join(',')})" if project_ids.present?
results = [] results = []
joins(:project, :revisions). visible.joins(:project, :revisions).
where(project_conditions.join(' AND ') + " AND #{DmsfFile.table_name}.deleted = :false", {:false => false}).scoping do where(project_conditions.join(' AND ')).scoping do
where(find_options[:conditions]).scoping do where(find_options[:conditions]).scoping do
results = where(limit_options) results = where(limit_options)
end end
@ -390,26 +391,10 @@ class DmsfFile < ActiveRecord::Base
else else
next if dmsf_file.updated_at > options[:offset] next if dmsf_file.updated_at > options[:offset]
end end
end end
allowed = user.allowed_to?(:view_dmsf_files, dmsf_file.project) if user.allowed_to?(:view_dmsf_files, dmsf_file.project) &&
project_included = false (project_ids.empty? || (project_ids.include?(dmsf_file.project.id)))
project_included = true unless projects
unless project_included
projects.each do |x|
if x.is_a?(ActiveRecord::Relation)
project_included = x.first.id == dmsf_file.project.id
else
if dmsf_file.project
project_included = x[:id] == dmsf_file.project.id
else
project_included = false
end
end
end
end
if allowed && project_included
# TODO: It works no more :-( # TODO: It works no more :-(
#dmsf_file.last_revision.description = dochash['sample'].force_encoding('UTF-8') if dochash['sample'] #dmsf_file.last_revision.description = dochash['sample'].force_encoding('UTF-8') if dochash['sample']
results << dmsf_file results << dmsf_file