change escaping (bnc#630988)

openSUSE · Dec 6, 2010 · 08a316f · 08a316f
1 parent cd8c463
commit 08a316f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
@@ -34,15 +34,15 @@ def perform_search
 
     base = @baseproject=="ALL" ? "" : @baseproject
     begin
-      @result = Seeker.prepare_result(CGI.escape(@query).gsub("+", " "), base, @project, @exclude_filter, @exclude_debug)
+      @result = Seeker.prepare_result(@query, base, @project, @exclude_filter, @exclude_debug)
       if @current_page == 1 # ignore sub pages
         SearchHistory.create :query => @query, :base => @baseproject, :patterns => @result.pattern_count,
           :binaries => @result.binary_count, :count => @result.length
       end
     rescue => e
       search_error, code, api_exception = ActiveXML::Transport.extract_error_message e
       if code == "413"
-        @result = Seeker.prepare_result(CGI.escape("\"#{@query}\"").gsub("+", " "), base, @project, @exclude_filter, @exclude_debug)
+        @result = Seeker.prepare_result(@query, base, @project, @exclude_filter, @exclude_debug)
         unless @result.blank?
           flash.now[:note] = _("Switched to exact match due to too many hits on substring search.")
         else

diff --git a/app/models/seeker.rb b/app/models/seeker.rb
@@ -25,6 +25,7 @@ def self.prepare_result(query, baseproject=nil, project=nil, exclude_filter=nil,
   class SearchResult < Array
     def self.search(query, baseproject, project=nil, exclude_filter=nil, exclude_debug=false)
 
+      query = query.gsub(/['"()]/, "")
       words = query.split(" ").select {|part| !part.match(/^[0-9_\.-]+$/) }
       versions = query.split(" ").select {|part| part.match(/^[0-9_\.-]+$/) }
       logger.debug "splitted words and version: #{words.inspect} #{versions.inspect}"
@@ -39,7 +40,7 @@ def self.search(query, baseproject, project=nil, exclude_filter=nil, exclude_deb
       xpath += " and @project = '#{project}' " unless project.blank?
       xpath += " and not(contains-ic(@name, '-debuginfo')) and not(contains-ic(@name, '-debugsource'))" if exclude_debug
       xpath += " and not(contains-ic(@project, '#{exclude_filter}'))" unless exclude_filter.blank?
-
+ 
       bin = Seeker.find :binary, :match => xpath
       pat = Seeker.find :pattern, :match => xpath
       result = new(query)