[myexperiment-hackers] [1913] trunk/app/controllers: Bugfixes for search, as reported by Stuart.

[noreply]

Revision

1913

Author

jits

Date

2008-10-31 10:37:27 -0400 (Fri, 31 Oct 2008)

Log Message

Bugfixes for search, as reported by Stuart.

Modified Paths

• trunk/app/controllers/blobs_controller.rb
• trunk/app/controllers/networks_controller.rb
• trunk/app/controllers/packs_controller.rb
• trunk/app/controllers/search_controller.rb
• trunk/app/controllers/users_controller.rb
• trunk/app/controllers/workflows_controller.rb

Diff

Modified: trunk/app/controllers/blobs_controller.rb (1912 => 1913)

--- trunk/app/controllers/blobs_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/blobs_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -25,10 +25,10 @@
   
   # GET /files;search
   def search
-
-    @query = params[:query] == nil ? "" : params[:query]
+    @query = params[:query] || ''
+    @query.strip!
     
-    @blobs = SOLR_ENABLE ? Blob.find_by_solr(@query, :limit => 100).results : []
+    @blobs = (SOLR_ENABLE && address@hidden) ? Blob.find_by_solr(@query, :limit => 100).results : []
     
     respond_to do |format|
       format.html # search.rhtml

Modified: trunk/app/controllers/networks_controller.rb (1912 => 1913)

--- trunk/app/controllers/networks_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/networks_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -18,10 +18,10 @@
   
   # GET /networks;search
   def search
-
-    @query = params[:query]
+    @query = params[:query] || ''
+    @query.strip!
     
-    @networks = SOLR_ENABLE ? Network.find_by_solr(@query, :limit => 100).results : []
+    @networks = (SOLR_ENABLE && address@hidden) ? Network.find_by_solr(@query, :limit => 100).results : []
     
     respond_to do |format|
       format.html # search.rhtml

Modified: trunk/app/controllers/packs_controller.rb (1912 => 1913)

--- trunk/app/controllers/packs_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/packs_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -23,9 +23,10 @@
   cache_sweeper :comment_sweeper, : [ :comment, :comment_delete ]
 
   def search
-    @query = params[:query]
+    @query = params[:query] || ''
+    @query.strip!
     
-    @packs = SOLR_ENABLE ? Pack.find_by_solr(@query, :limit => 100).results : []
+    @packs = (SOLR_ENABLE && address@hidden) ? Pack.find_by_solr(@query, :limit => 100).results : []
     
     respond_to do |format|
       format.html # search.rhtml

Modified: trunk/app/controllers/search_controller.rb (1912 => 1913)

--- trunk/app/controllers/search_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/search_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -31,12 +31,12 @@
   end
 
   def search_all
-    
-    @query = params[:query]
+    @query = params[:query] || ''
+    @query.strip!
 
     @results = []
 
-    if SOLR_ENABLE and not @query.nil? and @query != ""
+    if SOLR_ENABLE && address@hidden
       @results = User.multi_solr_search(@query, :limit => 100,
           :models => [User, Workflow, Blob, Network, Pack]).results
     end

Modified: trunk/app/controllers/users_controller.rb (1912 => 1913)

--- trunk/app/controllers/users_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/users_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -20,10 +20,10 @@
   
   # GET /users;search
   def search
-
-    @query = params[:query]
+    @query = params[:query] || ''
+    @query.strip!
     
-    results = SOLR_ENABLE ? User.find_by_solr(@query, :limit => 100).results : []
+    results = (SOLR_ENABLE && address@hidden) ? User.find_by_solr(@query, :limit => 100).results : []
     
     # Only show activated users!
     @users = results.select { |u| u.activated? }

Modified: trunk/app/controllers/workflows_controller.rb (1912 => 1913)

--- trunk/app/controllers/workflows_controller.rb	2008-10-31 14:26:19 UTC (rev 1912)
+++ trunk/app/controllers/workflows_controller.rb	2008-10-31 14:37:27 UTC (rev 1913)
@@ -34,10 +34,10 @@
   
   # GET /workflows;search
   def search
-
-    @query = params[:query]
+    @query = params[:query] || ''
+    @query.strip!
     
-    @workflows = SOLR_ENABLE ? Workflow.find_by_solr(@query, :limit => 100).results : []
+    @workflows = (SOLR_ENABLE && address@hidden) ? Workflow.find_by_solr(@query, :limit => 100).results : []
     
     respond_to do |format|
       format.html # search.rhtml