wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix nil error in search.

Browse Source
This commit is contained in:
bootstraponline
2012-06-22 11:24:13 -06:00
parent 611e1a536c
commit b1837abbc2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/wiki.rb
+4 -2
View File
@@ -481,14 +481,16 @@ module Gollum
@repo.git.grep(*args).split("\n").each do |line| @repo.git.grep(*args).split("\n").each do |line|
result = line.split(':') result = line.split(':')
file_name = result[1].gsub( ::File.extname(result[1]), '' ) result_1 = result[1]
file_name = result_1.gsub( ::File.extname(result_1), '' )
results[file_name] = result[2].to_i results[file_name] = result[2].to_i
end end
# Use git ls-files '*query*' to search for file names. Grep only searches file content. # Use git ls-files '*query*' to search for file names. Grep only searches file content.
@repo.git.ls_files({}, "*#{ query }*").split("\n").each do |line| @repo.git.ls_files({}, "*#{ query }*").split("\n").each do |line|
file_name = line.gsub( ::File.extname(line), '' ) file_name = line.gsub( ::File.extname(line), '' )
results[file_name] += 1; count = results[file_name]
results[file_name] = count == nil ? 1 : count + 1;
end end
results.map do |key,val| results.map do |key,val|