Merge branch 'pluginize-solr' into merge-solr

Rodrigo Souto
2 parents 8195b993 82423ba6
Showing 662 changed files with 125601 additions and 108485 deletions Show diff stats
INSTALL
Rakefile
app/controllers/admin/region_validators_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/category.rb
app/models/certifier.rb
app/models/comment.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/license.rb
app/models/national_region.rb
app/models/organization.rb
app/models/person.rb
app/models/product.rb
@@ -33,7 +33,7 @@ You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
 Debian-based systems, all of these packages are available through the Debian
 archive. You can install them with the following command:
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby openjdk-6-jre libdaemons-ruby thin tango-icon-theme libhpricot-ruby
+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
 On other systems, they may or may not be available through your regular package
 management system. Below are the links to their homepages.
@@ -43,7 +43,6 @@ management system. Below are the links to their homepages.
 * po4a: http://po4a.alioth.debian.org/
 * Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
 * rcov: http://eigenclass.org/hiki/rcov
-* Solr: http://lucene.apache.org/solr
 * RMagick: http://rmagick.rubyforge.org/
 * RedCloth: http://redcloth.org/
 * will_paginate: http://github.com/mislav/will_paginate/wikis
@@ -111,9 +110,6 @@ $ tar -zxvf noosfero-0.39.0.tar.gz
 $ ln -s noosfero-0.39.0 current
 $ cd current
-Copy config/solr.yml.dist to config/solr.yml. You will
-probably not need to customize this configuration, but have a look at it.
-
 Create the thin configuration file:
 $ thin -C config/thin.yml -e production config
@@ -195,10 +191,6 @@ Compile the translations:
 $ RAILS_ENV=production rake noosfero:translations:compile
-Run Solr:
-
-$ rake solr:start
-
 Now we must create some initial data. To create your default environment
 (the first one), run the command below:
@@ -7,6 +7,10 @@ require &#39;rake&#39;
 require 'rake/testtask'
 require 'rake/rdoctask'
-ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{|t| t == 'db:data:minimal'}
-
+# rails tasks
 require 'tasks/rails'
+
+# plugins' tasks
+plugins_tasks = Dir.glob("config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort +
+  Dir.glob("config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort
+plugins_tasks.each{ |ext| load ext }
@@ -33,7 +33,7 @@ class RegionValidatorsController &lt; AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = @region.search_possible_validators(params[:search])
+      @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
@@ -154,4 +154,18 @@ class ApplicationController &lt; ActionController::Base
     end
   end
+  def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
+    scope = scope.send(options[:filter]) if options[:filter]
+
+    @plugins.first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+    fallback_find_by_contents(asset, scope, query, paginate_options, options)
+  end
+
+  private
+
+  def fallback_find_by_contents(asset, scope, query, paginate_options, options)
+    return {:results => scope.paginate(paginate_options)} if query.blank?
+    {:results => scope.like_search(query).paginate(paginate_options)}
+  end
+
 end
@@ -270,7 +270,7 @@ class CmsController &lt; MyProfileController
   def search
     query = params[:q]
-    results = profile.files.published.find_by_contents(query)[:results]
+    results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
@@ -11,7 +11,7 @@ class ProfileSearchController &lt; PublicController
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -4,10 +4,11 @@ class SearchController &lt; PublicController
   include SearchHelper
   include ActionView::Helpers::NumberHelper
-  before_filter :redirect_asset_param, :except => [:facets_browse, :assets]
+  before_filter :redirect_asset_param, :except => :assets
   before_filter :load_category
   before_filter :load_search_assets
   before_filter :load_query
+  before_filter :load_filter
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -17,25 +18,51 @@ class SearchController &lt; PublicController
   no_design_blocks
-  def facets_browse
-    @asset = params[:asset]
-    @asset_class = asset_class(@asset)
+  def index
+    @searches = {}
+    @order = []
+    @names = {}
+    @results_only = true
-    @facets_only = true
-    send(@asset)
+    @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
+      load_query
+      @asset = key
+      send(key)
+      @order << key
+      @names[key] = getterm(description)
+    end
+    @asset = nil
-    @facet = @asset_class.map_facets_for(environment).find { |facet| facet[:id] == params[:facet_id] }
-    raise 'Facet not found' if @facet.nil?
+    if @searches.keys.size == 1
+      @asset = @searches.keys.first
+      render :action => @asset
+    end
+  end
-    render :layout => false
+  # view the summary of one category
+  def category_index
+    @searches = {}
+    @order = []
+    @names = {}
+    limit = MULTIPLE_SEARCH_LIMIT
+    [
+      [ :people, _('People'), :recent_people ],
+      [ :enterprises, _('Enterprises'), :recent_enterprises ],
+      [ :products, _('Products'), :recent_products ],
+      [ :events, _('Upcoming events'), :upcoming_events ],
+      [ :communities, _('Communities'), :recent_communities ],
+      [ :articles, _('Contents'), :recent_articles ]
+    ].each do |asset, name, filter|
+      @order << asset
+      @searches[asset]= {:results => @category.send(filter, limit)}
+      raise "No total_entries for: #{asset}" unless @searches[asset][:results].respond_to?(:total_entries)
+      @names[asset] = name
+    end
   end
   def articles
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
-    end
+    @scope = @environment.articles.public
+    full_text_search
   end
   def contents
@@ -43,49 +70,23 @@ class SearchController &lt; PublicController
   end
   def people
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Person)
+    full_text_search
   end
   def products
-    public_filters = ['public:true', 'enabled:true']
-    if !@empty_query
-      full_text_search public_filters
-    else
-      @one_page = true
-      @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
-
-      extra_limit = LIST_SEARCH_LIMIT*5
-      sql_options = {:limit => LIST_SEARCH_LIMIT, :order => 'random()'}
-      if @geosearch
-        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
-          :alternate_query => "{!boost b=recip(geodist(),#{"%e" % (1.to_f/DistBoost)},1,1)}",
-          :radius => DistFilt, :latitude => current_user.person.lat, :longitude => current_user.person.lng
-      else
-        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
-          :boost_functions => ['recip(ms(NOW/HOUR,updated_at),1.3e-10,1,1)']
-      end
-    end
+    @scope = @environment.products
+    full_text_search
   end
   def enterprises
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @filter_title = _('Enterprises from network')
-      @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Enterprise, [{:products => :product_category}])
+    full_text_search
   end
   def communities
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Community)
+    full_text_search
   end
   def events
@@ -93,7 +94,7 @@ class SearchController &lt; PublicController
     month = (params[:month] ? params[:month].to_i : Date.today.month)
     day = (params[:day] ? params[:day].to_i : Date.today.day)
     date = build_date(params[:year], params[:month], params[:day])
-    date_range = (date - 1.month)..(date + 1.month).at_end_of_month
+    date_range = (date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month
     @selected_day = nil
     @events_of_the_day = []
@@ -104,64 +105,21 @@ class SearchController &lt; PublicController
         environment.events.by_day(@selected_day)
     end
-    if !@empty_query
-      full_text_search
-    else
-      @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
-    end
+    @scope = date_range ? environment.events.by_range(date_range) : environment.events
+    full_text_search
-    events = @results[@asset]
+    events = @searches[@asset][:results]
     @calendar = populate_calendar(date, events)
     @previous_calendar = populate_calendar(date - 1.month, events)
     @next_calendar = populate_calendar(date + 1.month, events)
   end
-  def index
-    @results = {}
-    @order = []
-    @names = {}
-    @results_only = true
-
-    @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
-      load_query
-      @asset = key
-      send(key)
-      @order << key
-      @names[key] = getterm(description)
-    end
-    @asset = nil
-    @facets = {}
-
-    render :action => @results.keys.first if @results.keys.size == 1
-  end
-
   # keep old URLs workings
   def assets
     params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
     redirect_to params
   end
-  # view the summary of one category
-  def category_index
-    @results = {}
-    @order = []
-    @names = {}
-    limit = MULTIPLE_SEARCH_LIMIT
-    [
-      [ :people, _('People'), :recent_people ],
-      [ :enterprises, _('Enterprises'), :recent_enterprises ],
-      [ :products, _('Products'), :recent_products ],
-      [ :events, _('Upcoming events'), :upcoming_events ],
-      [ :communities, _('Communities'), :recent_communities ],
-      [ :articles, _('Contents'), :recent_articles ]
-    ].each do |asset, name, filter|
-      @order << asset
-      @results[asset] = @category.send(filter, limit)
-      raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
-      @names[asset] = name
-    end
-  end
-
   def tags
     @tags_cache_key = "tags_env_#{environment.id.to_s}"
     if is_cache_expired?(@tags_cache_key)
@@ -173,7 +131,7 @@ class SearchController &lt; PublicController
     @tag = params[:tag]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
-      @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
+      @searches[@asset] = {:results => environment.articles.find_tagged_with(@tag).paginate(paginate_options)}
     end
   end
@@ -187,11 +145,9 @@ class SearchController &lt; PublicController
   protected
   def load_query
-    @asset = params[:action].to_sym
+    @asset = (params[:asset] || params[:action]).to_sym
     @order ||= [@asset]
-    @results ||= {}
-    @filter = filter
-    @filter_title = filter_description(@asset, @filter)
+    @searches ||= {}
     @query = params[:query] || ''
     @empty_query = @category.nil? && @query.blank?
@@ -211,42 +167,13 @@ class SearchController &lt; PublicController
     end
   end
-  FILTERS = %w(
-    more_recent
-    more_active
-    more_popular
-    more_comments
-  )
-  def filter
-    if FILTERS.include?(params[:filter])
-      params[:filter]
-    else
-      'more_recent'
-    end
-  end
-
-  def filter_description(asset, filter)
-    {
-      'articles_more_recent' => _('More recent contents from network'),
-      'articles_more_popular' => _('More viewed contents from network'),
-      'articles_more_comments' => _('Most commented contents from network'),
-      'people_more_recent' => _('More recent people from network'),
-      'people_more_active' => _('More active people from network'),
-      'people_more_popular' => _('More popular people from network'),
-      'communities_more_recent' => _('More recent communities from network'),
-      'communities_more_active' => _('More active communities from network'),
-      'communities_more_popular' => _('More popular communities from network'),
-      'products_more_recent' => _('Highlights'),
-    }[asset.to_s + '_' + filter]
-  end
-
   def load_search_assets
-    if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
+    if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
       render_not_found
       return
     end
-    @enabled_searches = Searches.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
@@ -256,13 +183,19 @@ class SearchController &lt; PublicController
     @names = @titles if @names.nil?
   end
+  def load_filter
+    @filter = 'more_recent'
+    if SEARCHES.keys.include?(@asset.to_sym)
+      available_filters = asset_class(@asset)::SEARCH_FILTERS
+      @filter = params[:filter] if available_filters.include?(params[:filter])
+    end
+  end
+
   def limit
-    if map_search?
+    if map_search?(@searches)
       MAP_SEARCH_LIMIT
     elsif !multiple_search?
-      if [:people, :communities].include? @asset
-        BLOCKS_SEARCH_LIMIT
-      elsif @asset == :enterprises and @empty_query
+      if [:people, :communities, :enterprises].include? @asset
         BLOCKS_SEARCH_LIMIT
       else
         LIST_SEARCH_LIMIT
@@ -273,41 +206,12 @@ class SearchController &lt; PublicController
   end
   def paginate_options(page = params[:page])
-    page = 1 if multiple_search? or params[:display] == 'map'
+    page = 1 if multiple_search?(@searches) || params[:display] == 'map'
     { :per_page => limit, :page => page }
   end
-  def full_text_search(filters = [], options = {})
-    paginate_options = paginate_options(params[:page])
-    asset_class = asset_class(@asset)
-    solr_options = options
-    pg_options = paginate_options(params[:page])
-
-    if !multiple_search?
-      if !@results_only and asset_class.respond_to? :facets
-        solr_options.merge! asset_class.facets_find_options(params[:facet])
-        solr_options[:all_facets] = true
-      end
-      solr_options[:filter_queries] ||= []
-      solr_options[:filter_queries] += filters
-      solr_options[:filter_queries] << "environment_id:#{environment.id}"
-      solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
-
-      solr_options[:boost_functions] ||= []
-      params[:order_by] = nil if params[:order_by] == 'none'
-      if params[:order_by]
-        order = SortOptions[@asset][params[:order_by].to_sym]
-        raise "Unknown order by" if order.nil?
-        order[:solr_opts].each do |opt, value|
-          solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
-        end
-      end
-    end
-
-    ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
-    @results[@asset] = ret[:results]
-    @facets = ret[:facets]
-    @all_facets = ret[:all_facets]
+  def full_text_search
+    @searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
   end
   private
@@ -274,9 +274,9 @@ module ApplicationHelper
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
-  def partial_for_class_in_view_path(klass, view_path, suffix = nil)
+  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
     return nil if klass.nil?
-    name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
+    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
     search_name = String.new(name)
     if search_name.include?("/")
@@ -291,14 +291,14 @@ module ApplicationHelper
       return name if File.exists?(File.join(path))
     end
-    partial_for_class_in_view_path(klass.superclass, view_path, suffix)
+    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
   end
-  def partial_for_class(klass, suffix=nil)
+  def partial_for_class(klass, prefix=nil, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
     @controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path, suffix)
+      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
       return partial if partial
     end
@@ -2,12 +2,10 @@ module SearchHelper
   MAP_SEARCH_LIMIT = 2000
   LIST_SEARCH_LIMIT = 20
-  BLOCKS_SEARCH_LIMIT = 18
+  BLOCKS_SEARCH_LIMIT = 24
   MULTIPLE_SEARCH_LIMIT = 8
-  DistFilt = 200
-  DistBoost = 50
-  Searches = ActiveSupport::OrderedHash[
+  SEARCHES = ActiveSupport::OrderedHash[
     :articles, _('Contents'),
     :enterprises, _('Enterprises'),
     :people, _('People'),
@@ -16,46 +14,31 @@ module SearchHelper
     :events, _('Events'),
   ]
-  SortOptions = {
-    :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-      :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
-        :solr_opts => {:sort => "geodist() asc",
-          :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
-    ],
-    :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
-    ],
-    :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
+  FILTER_TRANSLATION = {
+    'more_popular' => _('More popular'),
+    'more_active' => _('More active'),
+    'more_recent' => _('More recent'),
+    'more_comments' => _('More comments')
   }
   # FIXME remove it after search_controler refactored
   include EventsHelper
-  def multiple_search?
-    ['index', 'category_index'].include?(params[:action]) or @results.size > 1
+  def multiple_search?(searches=nil)
+    ['index', 'category_index'].include?(params[:action]) || (searches && searches.size > 1)
   end
-  def map_search?
-    !@empty_query and !multiple_search? and params[:display] == 'map'
+  def map_search?(searches=nil)
+    !multiple_search?(searches) && params[:display] == 'map'
+  end
+
+  def asset_class(asset)
+    asset.to_s.singularize.camelize.constantize
   end
   def search_page_title(title, category = nil)
     title = "<h1>" + title
-    title += '<small>' + category.name + '</small>' if category
+    title += ' - <small>' + category.name + '</small>' if category
     title + "</h1>"
   end
@@ -66,8 +49,12 @@ module SearchHelper
       :align => 'center', :class => 'search-category-context') if category
   end
-  def display_results(map_capable = false)
-    if map_capable and map_search?
+  def display?(asset, mode)
+    defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
+  end
+
+  def display_results(searches=nil, asset=nil)
+    if display?(asset, :map) && map_search?(searches)
       partial = 'google_maps'
       klass = 'map'
     else
@@ -78,10 +65,13 @@ module SearchHelper
     content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
   end
-  def display_map_list_button
-    button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
-           params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
-           :class => "map-toggle-button" )
+  def display_filter(asset, display)
+    asset = :articles if asset == :tag
+    if display?(asset, display)
+      display
+    else
+      asset_class(asset).default_search_display
+    end
   end
   def city_with_state(city)
@@ -97,120 +87,50 @@ module SearchHelper
     end
   end
-  def facets_menu(asset, _facets)
-    @asset_class = asset_class(asset)
-    @facets = _facets
-    render(:partial => 'facets_menu')
-  end
-
-  def facets_unselect_menu(asset)
-    @asset_class = asset_class(asset)
-    render(:partial => 'facets_unselect_menu')
-  end
-
-  def facet_javascript(input_id, facet, array)
-    array = [] if array.nil?
-    hintText = _('Type in an option')
-    text_field_tag('facet['+input_id+']', '', :id => input_id) +
-      javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
-        {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
-        #{jquery_token_input_messages_json(hintText)}});")
-  end
-
-  def facet_link_html(facet, params, value, label, count)
-    params = params ? params.dup : {}
-    has_extra = label.kind_of?(Array)
-    link_label = has_extra ? label[0] : label
-    id = facet[:solr_field].to_s
-    params[:facet] ||= {}
-    params[:facet][id] ||= {}
-    params[:page] = {} if params[:page]
-
-    selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
-
-    if count > 0
-      url = params.merge(:facet => params[:facet].merge(
-        id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a | [value] )
-      ))
-    else
-      # preserve others filters and change this filter
-      url = params.merge(:facet => params[:facet].merge(
-        id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
-      ))
+  def display_selector(asset, display, float = 'right')
+    display = nil if display.blank?
+    display ||= asset_class(asset).default_search_display
+    if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1
+      compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
+      map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
+      full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
+      content_tag('div', 
+        content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
+        :class => 'search-customize-options'
+      )
     end
-
-    content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
-        content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
-        (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
-      :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
   end
-  def facet_selecteds_html_for(environment, klass, params)
-    def name_with_extra(klass, facet, value)
-      name = klass.facet_result_name(facet, value)
-      name = name[0] + name[1] if name.kind_of?(Array)
-      name
-    end
-
-    ret = []
-    params = params.dup
-    params[:facet].each do |id, value|
-      facet = klass.facet_by_id(id.to_sym)
-      next unless facet
-      if value.kind_of?(Hash)
-        label_hash = facet[:label].call(environment)
-        value.each do |label_id, value|
-          facet[:label_id] = label_id
-          facet[:label] = label_hash[label_id]
-          value.to_a.each do |value|
-            ret << [facet[:label], name_with_extra(klass, facet, value),
-              params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ |v| v == value })))]
-          end
-        end
-      else
-        ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
-          params.merge(:facet => params[:facet].reject{ |k,v| k == id })]
-      end
+  def filter_selector(asset, filter, float = 'right')
+    klass = asset_class(asset)
+    if klass::SEARCH_FILTERS.count > 1
+      options = options_for_select(klass::SEARCH_FILTERS.map {|f| [FILTER_TRANSLATION[f], f]}, filter)
+      url_params = url_for(params.merge(:filter => 'FILTER'))
+      onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+      select_field = select_tag(:filter, options, :onchange => onchange)
+      content_tag('div',
+        content_tag('strong', _('Filter')) + ': ' + select_field,
+        :class => "search-customize-options"
+      )
     end
-
-    ret.map do |label, name, url|
-      content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
-        content_tag('span', name, :class => 'facet-selected-name') +
-        link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
-    end.join
-  end
-
-  def order_by(asset)
-    options = SortOptions[asset].map do |name, options|
-      next if options[:if] and ! instance_eval(&options[:if])
-      [_(options[:label]), name.to_s]
-    end.compact
-
-    content_tag('div', _('Sort results by ') +
-      select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] || 'none'),
-        {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
-      :class => "search-ordering")
-  end
-
-  def label_total_found(asset, total_found)
-    labels = {
-      :products => _("%s products offers found"),
-      :articles => _("%s articles found"),
-      :events => _("%s events found"),
-      :people => _("%s people found"),
-      :enterprises => _("%s enterprises found"),
-      :communities => _("%s communities found"),
-    }
-    content_tag('span', labels[asset] % total_found,
-      :class => "total-pages-found") if labels[asset]
-  end
-
-  def asset_class(asset)
-    asset.to_s.singularize.camelize.constantize
   end
-  def asset_table(asset)
-    asset_class(asset).table_name
+  def filter_title(asset, filter)
+    {
+      'articles_more_recent' => _('More recent contents from network'),
+      'articles_more_popular' => _('More viewed contents from network'),
+      'articles_more_comments' => _('Most commented contents from network'),
+      'people_more_recent' => _('More recent people from network'),
+      'people_more_active' => _('More active people from network'),
+      'people_more_popular' => _('More popular people from network'),
+      'communities_more_recent' => _('More recent communities from network'),
+      'communities_more_active' => _('More active communities from network'),
+      'communities_more_popular' => _('More popular communities from network'),
+      'enterprises_more_recent' => _('More recent enterprises from network'),
+      'enterprises_more_active' => _('More active enterprises from network'),
+      'enterprises_more_popular' => _('More popular enterprises from network'),
+      'products_more_recent' => _('Highlights'),
+    }[asset.to_s + '_' + filter].to_s
   end
 end
@@ -2,6 +2,26 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :abstract => 3,
+    :body => 2,
+    :slug => 1,
+    :filename => 1,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+    more_popular
+    more_comments
+  ]
+
+  SEARCH_DISPLAYS = %w[full]
+
+  def self.default_search_display
+    'full'
+  end
+
   #FIXME This is necessary because html is being generated on the model...
   include ActionView::Helpers::TagHelper
@@ -147,7 +167,6 @@ class Article &lt; ActiveRecord::Base
     else
       ArticleCategorization.add_category_to_article(c, self)
       self.categories(reload)
-      self.solr_save
     end
   end
@@ -165,7 +184,6 @@ class Article &lt; ActiveRecord::Base
       ArticleCategorization.add_category_to_article(item, self)
     end
     self.categories(true)
-    self.solr_save
     pending_categorizations.clear
   end
@@ -201,20 +219,12 @@ class Article &lt; ActiveRecord::Base
   named_scope :public,
     :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
-  named_scope :more_recent,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
-      ((articles.type != ?) OR articles.type is NULL)",
-      true, true, true, true, 'RssFeed'
-    ],
-    :order => 'articles.published_at desc, articles.id desc'
-
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
   def self.most_commented(limit)
     paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
   end
-  named_scope :more_popular, :order => 'hits DESC'
   named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
@@ -426,8 +436,8 @@ class Article &lt; ActiveRecord::Base
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+  named_scope :more_popular, :order => 'hits DESC'
   named_scope :more_comments, :order => "comments_count DESC"
-  named_scope :more_views, :order => "hits DESC"
   named_scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
@@ -479,10 +489,6 @@ class Article &lt; ActiveRecord::Base
     allow_post_content?(user) || user && allow_members_to_edit && user.is_member_of?(profile)
   end
-  def comments_updated
-    solr_save
-  end
-
   def accept_category?(cat)
     !cat.is_a?(ProductCategory)
   end
@@ -620,7 +626,7 @@ class Article &lt; ActiveRecord::Base
   end
-  def more_views_label
+  def more_popular_label
     amount = self.hits
     {
       0 => _('no views'),
@@ -648,98 +654,7 @@ class Article &lt; ActiveRecord::Base
     img.nil? ? '' : img.attributes['src']
   end
-  private
-
-  # FIXME: workaround for development env.
-  # Subclasses aren't (re)loaded, and acts_as_solr
-  # depends on subclasses method to search
-  # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
-  UploadedFile
-  TextArticle
-  TinyMceArticle
-  TextileArticle
-  Folder
-  EnterpriseHomepage
-  Gallery
-  Blog
-  Forum
-  Event
-
-  def self.f_type_proc(klass)
-    klass.constantize.type_name
-  end
-
-  def self.f_profile_type_proc(klass)
-    klass.constantize.type_name
-  end
-
-  def f_type
-    #join common types
-    case self.class.name
-    when 'TinyMceArticle', 'TextileArticle'
-      TextArticle.name
-    else
-      self.class.name
-    end
-  end
-
-  def f_profile_type
-    self.profile.class.name
-  end
-
-  def f_published_at
-    self.published_at
-  end
-
-  def f_category
-    self.categories.collect(&:name)
-  end
-
   delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
-  def name_sortable # give a different name for solr
-    name
-  end
-
-  def public
-    self.public?
-  end
-
-  def category_filter
-    categories_including_virtual_ids
-  end
-
-  public
-
-  acts_as_faceted :fields => {
-      :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
-      :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
-        '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
-        :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
-      :f_profile_type => {:label => _('Profile'), :proc => proc{|klass| f_profile_type_proc(klass)}},
-      :f_category => {:label => _('Categories')},
-    }, :category_query => proc { |c| "category_filter:\"#{c.id}\"" },
-    :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:slug => :text}, {:body => :text},
-      {:abstract => :text}, {:filename => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:profile_id => :integer}, :language,
-      {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
-      :updated_at, :created_at,
-    ], :include => [
-      {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
-      {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
-      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc { |a| 10 if a.profile && a.profile.enabled },
-    :if => proc{ |a| ! ['RssFeed'].include?(a.class.name) }
-  handle_asynchronously :solr_save
   private
 class Category < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :acronym => 5,
+    :abbreviation => 5,
+    :slug => 1,
+  }
+
   validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
   validates_presence_of :name, :environment_id
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
@@ -100,23 +107,4 @@ class Category &lt; ActiveRecord::Base
     self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
   end
-  private
-  def name_sortable # give a different name for solr
-    name
-  end
-  public
-
-  acts_as_searchable :fields => [
-    # searched fields
-    {:name => {:type => :text, :boost => 2.0}},
-    {:path => :text}, {:slug => :text},
-    {:abbreviation => :text}, {:acronym => :text},
-    # filtered fields
-    :parent_id,
-    # ordered/query-boosted fields
-    {:name_sortable => :string},
-  ]
-  after_save_reindex [:articles, :profiles], :with => :delayed_job
-  handle_asynchronously :solr_save
-
 end
 class Certifier < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :description => 3,
+    :link => 1,
+  }
+
   belongs_to :environment
   has_many :qualifier_certifiers, :dependent => :destroy
@@ -24,6 +30,4 @@ class Certifier &lt; ActiveRecord::Base
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
 class Comment < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :title => 10,
+    :name => 4,
+    :body => 2,
+  }
+
   validates_presence_of :body
   belongs_to :source, :counter_cache => true, :polymorphic => true
@@ -78,12 +84,6 @@ class Comment &lt; ActiveRecord::Base
     self.article.profile.notification_emails - [self.author_email || self.email]
   end
-  after_save :notify_article
-  after_destroy :notify_article
-  def notify_article
-    article.comments_updated if article.kind_of?(Article)
-  end
-
   after_create :new_follower
   def new_follower
     if source.kind_of?(Article)
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  SEARCH_DISPLAYS += %w[map full]
+
   def self.type_name
     _('Enterprise')
   end
@@ -14,8 +16,6 @@ class Enterprise &lt; Organization
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
-  after_save_reindex [:products], :with => :delayed_job
-  extra_data_for_index :product_categories
   def product_categories
     products.includes(:product_category).map{|p| p.category_full_name}.compact
   end
@@ -189,4 +189,8 @@ class Enterprise &lt; Organization
     { :profile => identifier, :controller => 'catalog'}
   end
+  def more_recent_label
+    ''
+  end
+
 end
@@ -268,8 +268,6 @@ class Environment &lt; ActiveRecord::Base
   settings_items :search_hints, :type => Hash, :default => {}
-  settings_items :top_level_category_as_facet_ids, :type => Array, :default => []
-
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
 class License < ActiveRecord::Base
+
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :url => 5,
+  }
+
   belongs_to :environment
   has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
 class NationalRegion < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 1,
+    :national_region_code => 1,
+  }
+
   def self.search_city(city_name, like = false, state = nil)
     operator = "="
 # Represents any organization of the system
 class Organization < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   settings_items :closed, :type => :boolean, :default => false
   def closed?
     closed
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   def self.type_name
     _('Person')
   end
 class Product < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :description => 1,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
+  SEARCH_DISPLAYS = %w[map full]
+
+  def self.default_search_display
+    'full'
+  end
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -173,7 +188,7 @@ class Product &lt; ActiveRecord::Base
   def price_described?
     return false if price.blank? or price == 0
-    (price - total_production_cost).zero?
+    (price - total_production_cost.to_f).zero?
   end
   def update_price_details(price_details)
@@ -215,89 +230,6 @@ class Product &lt; ActiveRecord::Base
         end
   end
-  private
-  def f_category
-    self.product_category.name
-  end
-  def f_region
-    self.enterprise.region.id if self.enterprise.region
-  end
-  def self.f_region_proc(id)
-    c = Region.find(id)
-    s = c.parent
-    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
-      [c.name, ', ' + s.acronym]
-    else
-      c.name
-    end
-  end
-  def self.f_qualifier_proc(ids)
-    array = ids.split
-    qualifier = Qualifier.find_by_id array[0]
-    certifier = Certifier.find_by_id array[1]
-    certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
-  end
-  def f_qualifier
-    product_qualifiers.map do |pq|
-      "#{pq.qualifier_id} #{pq.certifier_id}"
-    end
-  end
-
-  alias_method :name_sortable, :name
   delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
-  def name_sortable # give a different name for solr
-    name
-  end
-  def public
-    self.public?
-  end
-  def price_sortable
-    (price.nil? or price.zero?) ? nil : price
-  end
-  def category_filter
-    enterprise.categories_including_virtual_ids << product_category_id
-  end
-  public
-
-  acts_as_faceted :fields => {
-      :f_category => {:label => _('Related products')},
-      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
-      :f_qualifier => {:label => _('Qualifiers'), :proc => proc { |id| f_qualifier_proc(id) }},
-    }, :category_query => proc { |c| "category_filter:#{c.id}" },
-    :order => [:f_category, :f_region, :f_qualifier]
-
-  Boosts = [
-    [:image, 0.55, proc{ |p| p.image ? 1 : 0}],
-    [:qualifiers, 0.45, proc{ |p| p.product_qualifiers.count > 0 ? 1 : 0}],
-    [:open_price, 0.45, proc{ |p| p.price_described? ? 1 : 0}],
-    [:solidarity, 0.45, proc{ |p| p.percentage_from_solidarity_economy[0].to_f/100 }],
-    [:available, 0.35, proc{ |p| p.available ? 1 : 0}],
-    [:price, 0.35, proc{ |p| (!p.price.nil? and p.price > 0) ? 1 : 0}],
-    [:new_product, 0.35, proc{ |p| (p.updated_at.to_i - p.created_at.to_i) < 24*3600 ? 1 : 0}],
-    [:description, 0.3, proc{ |p| !p.description.blank? ? 1 : 0}],
-    [:enabled, 0.2, proc{ |p| p.enterprise.enabled ? 1 : 0}],
-  ]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:description => :text}, {:category_full_name => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:enabled => :boolean}, {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:price_sortable => :decimal}, {:name_sortable => :string},
-      {:lat => :float}, {:lng => :float},
-      :updated_at, :created_at,
-    ], :include => [
-      {:product_category => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
-      {:enterprise => {:fields => [:name, :identifier, :address, :nickname, :lat, :lng]}},
-      {:qualifiers => {:fields => [:name]}},
-      {:certifiers => {:fields => [:name]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc{ |p| boost = 1; Boosts.each{ |b| boost = boost * (1 - ((1 - b[2].call(p)) * b[1])) }; boost}
-  handle_asynchronously :solr_save
-  after_save_reindex [:enterprise], :with => :delayed_job
 end
@@ -11,6 +11,4 @@ class ProductCategory &lt; Category
     top_category ? top_category.children : top_level_for(env).select{|c|c.kind_of?(ProductCategory)}
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
@@ -3,10 +3,20 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
-  # use for internationalizable human type names in search facets
-  # reimplement on subclasses
-  def self.type_name
-    _('Profile')
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :identifier => 5,
+    :nickname => 2,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
+  SEARCH_DISPLAYS = %w[compact]
+
+  def self.default_search_display
+    'compact'
   end
   module Roles
@@ -127,18 +137,6 @@ class Profile &lt; ActiveRecord::Base
     scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
   end
-  class_inheritable_accessor :extra_index_methods
-  self.extra_index_methods = []
-
-  def extra_data_for_index
-    self.class.extra_index_methods.map { |meth| meth.to_proc.call(self) }.flatten
-  end
-
-  def self.extra_data_for_index(sym = nil, &block)
-    self.extra_index_methods.push(sym) if sym
-    self.extra_index_methods.push(block) if block_given?
-  end
-
   acts_as_having_settings :field => :data
   def settings
@@ -262,7 +260,6 @@ class Profile &lt; ActiveRecord::Base
     else
       ProfileCategorization.add_category_to_profile(c, self)
       self.categories(true)
-      self.solr_save
     end
     self.categories(reload)
   end
@@ -894,86 +891,6 @@ private :generate_url, :url_options
     self.active_fields
   end
-  private
-  def self.f_categories_label_proc(environment)
-    ids = environment.top_level_category_as_facet_ids
-    r = Category.find(ids)
-    map = {}
-    ids.map{ |id| map[id.to_s] = r.detect{|c| c.id == id}.name }
-    map
-  end
-  def self.f_categories_proc(facet, id)
-    id = id.to_i
-    return if id.zero?
-    c = Category.find(id)
-    c.name if c.top_ancestor.id == facet[:label_id].to_i or facet[:label_id] == 0
-  end
-  def f_categories
-    category_ids - [region_id]
-  end
-
-  def f_region
-    self.region_id
-  end
-  def self.f_region_proc(id)
-    c = Region.find(id)
-    s = c.parent
-    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
-      [c.name, ', ' + s.acronym]
-    else
-      c.name
-    end
-  end
-
-  def self.f_enabled_proc(enabled)
-    enabled = enabled == "true" ? true : false
-    enabled ? s_('facets|Enabled') : s_('facets|Not enabled')
-  end
-  def f_enabled
-    self.enabled
-  end
-
-  def name_sortable # give a different name for solr
-    name
-  end
-  def public
-    self.public?
-  end
-  def category_filter
-    categories_including_virtual_ids
-  end
-  public
-
-  acts_as_faceted :fields => {
-      :f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
-        :proc => proc { |id| f_enabled_proc(id) }},
-      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
-      :f_categories => {:multi => true, :proc => proc {|facet, id| f_categories_proc(facet, id)},
-        :label => proc { |env| f_categories_label_proc(env) }, :label_abbrev => proc{ |env| f_categories_label_abbrev_proc(env) }},
-    }, :category_query => proc { |c| "category_filter:#{c.id}" },
-    :order => [:f_region, :f_categories, :f_enabled]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:identifier => :text}, {:nickname => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:name_sortable => :string}, {:user_id => :integer},
-      :enabled, :active, :validated, :public_profile,
-      {:lat => :float}, {:lng => :float},
-      :updated_at, :created_at,
-    ],
-    :include => [
-      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
-      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc{ |p| 10 if p.enabled }
-  after_save_reindex [:articles], :with => :delayed_job
-  handle_asynchronously :solr_save
-
   def control_panel_settings_button
     {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
   end
 class Qualifier < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 1,
+  }
+
   belongs_to :environment
   has_many :qualifier_certifiers, :dependent => :destroy
@@ -15,6 +19,4 @@ class Qualifier &lt; ActiveRecord::Base
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
@@ -4,12 +4,6 @@ class Region &lt; Category
   require_dependency 'enterprise' # enterprises can also be validators
-  # searches for organizations that could become validators for this region.
-  # <tt>search</tt> is passed as is to find_by_contents on Organization.
-  def search_possible_validators(search)
-    Organization.find_by_contents(search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
-  end
-
   def has_validator?
     validators.count > 0
   end
 class Scrap < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :content => 1,
+  }
   validates_presence_of :content
   validates_presence_of :sender_id, :receiver_id
@@ -33,7 +33,6 @@
       </div>
       <div id="wrap-2">
         <%= render :partial => 'layouts/user' %>
-
         <h1 id="site-title">
           <%= theme_site_title %>
         </h1>
 <div id="balloon">
-  <%= render :partial => 'search/product', :locals => {:product => @product} %>
+  <%= render :partial => 'search/full_product', :locals => {:product => @product} %>
 </div>
@@ -1,12 +0,0 @@
-<li class="search-article-item article-item">
-  <%= link_to(article.title, article.url, :class => "search-result-title") %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => article %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <%= render :partial => 'article_common', :object => article %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => article %>
-
-  <div style="clear:both"></div>
-</li>
@@ -1,24 +0,0 @@
-<li class="search-blog article-item">
-  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => blog %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-blog-items">
-      <td class="search-field-label"><%= _("Last posts") %></td>
-
-      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => blog %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => blog %>
-
-  <div style="clear: both;"/></div>
-</li>
@@ -0,0 +1,5 @@
+<% filter_label = profile.send(@filter + '_label') %>
+<% filter_label += show_date(profile.created_at) if @filter == 'more_recent' %>
+<li class="search-profile-item">
+  <%= profile_image_link profile, :portrait, 'div', filter_label %>
+</li>
@@ -1 +0,0 @@
-_article.rhtml
 \ No newline at end of file
 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
   <% @order.each do |name| %>
-    <% results = @results[name] %>
-    <% empty = results.nil? || results.empty? %>
+    <% search = @searches[name] %>
-    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if empty %>">
-      <% if not empty %>
-        <% partial = partial_for_class(results.first.class.class_name.constantize) %>
+    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
+      <% if !search[:results].blank? %>
-        <% if multiple_search? %>
+        <% if multiple_search?(@searches) %>
           <h3><%= @names[name] %></h3>
-          <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
-            <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+            <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
           <% end %>
         <% end %>
-        <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
+        <% display = display_filter(name, params[:display]) %>
+
+        <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if [:enterprises, :people, :communities].include?(name) %>">
           <ul>
-          <% results.each do |hit| %>
-            <%= render :partial => partial_for_class(hit.class), :object => hit %>
-          <% end %>
+            <% search[:results].each do |hit| %>
+              <% partial = partial_for_class(hit.class, display) %>
+              <% variable_name = partial.gsub("#{display}_", '').to_sym %>
+              <%= render :partial => partial, :locals => {variable_name => hit} %>
+            <% end %>
           </ul>
         </div>
       <% else %>
@@ -1,25 +0,0 @@
-<li class="search-event-item article-item">
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-<div class="search-content-first-column">
-  <%= render :partial => 'image', :object => event %>
-</div>
-<table class="noborder search-content-second-column">
-  <% if event.start_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('Start date') %></td>
-      <td class="article-item-date"><%= event.start_date %></td>
-    </tr>
-  <% end %>
-  <% if event.end_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('End date') %></td>
-      <td class="article-item-date"><%= event.end_date %></td>
-    </tr>
-  <% end %>
-
-  <%= render :partial => 'article_common', :object => event %>
-</table>
-<%= render :partial => 'article_last_change', :object => event %>
-
-<div style="clear: both"></div>
-</li>
@@ -1,36 +0,0 @@
-<% less_options_limit = 8 %>
-
-<div id="facets-menu">
-  <% @asset_class.map_facets_for(environment).each do |facet| %>
-
-    <div id="facet-menu-<%= facet[:id].to_s %>" class="facet-menu">
-      <div class="facet-menu-label">
-        <%= @asset_class.facet_label(facet) %>
-      </div>
-
-      <% results = @asset_class.map_facet_results(facet, params[:facet], @facets, @all_facets, :limit => less_options_limit) %>
-      <% facet_count = results.total_entries %>
-
-      <% if facet_count > 0 %>
-        <div class="facet-menu-options facet-menu-more-options" style="display: none">
-        </div>
-
-        <div class="facet-menu-options facet-menu-less-options">
-          <% results.each do |id, label, count| %>
-            <%= facet_link_html(facet, params, id, label, count) %><br />
-          <% end %>
-        </div> <br />
-
-        <% if facet_count > less_options_limit %>
-          <%= link_to_function _("Options"),
-            "facet_options_toggle('#{facet[:id].to_s}', '#{url_for(params.merge(:action => 'facets_browse', :facet_id => facet[:id], :asset => @asset, :escape => false))}'); " + 
-            "jQuery(this).toggleClass('facet-less-options')", :class => "facet-options-toggle" %>
-          <br />
-        <% end %>
-
-      <% else %>
-        <span class="facet-any-result-found"><%= _("No filter available") %></span>
-      <% end %>
-    </div>
-  <% end %>
-</div>
@@ -1,6 +0,0 @@
-<div class="facets-applied">
-  <% if params[:facet] and params[:facet].count > 0 %>
-    <span class="facets-applied-label"><%= _("Applied filters") %> </span>
-    <%= facet_selecteds_html_for(environment, asset_class(@asset), params) %>
-  <% end %>
-</div>
@@ -1,24 +0,0 @@
-<li class="search-folder-item article-item">
-  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => folder %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-folder-items">
-      <td class="search-field-label"><%= _("Last items") %></td>
-
-      <% r = folder.children.last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => folder %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => folder %>
-
-  <div style="clear:both"></div>
-</li>
@@ -1,24 +0,0 @@
-<li class="search-forum-item article-item">
-  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => forum %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-forum-items">
-      <td class="search-field-label"><%= _("Last topics") %></td>
-
-      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => forum %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => forum %>
-
-  <div style="clear:both"></div>
-</li>
@@ -0,0 +1,12 @@
+<li class="search-article-item article-item">
+  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => article %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => article %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-blog article-item">
+  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => blog %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-blog-items">
+      <td class="search-field-label"><%= _("Last posts") %></td>
+
+      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => blog %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => blog %>
+
+  <div style="clear: both;"/></div>
+</li>
@@ -0,0 +1,38 @@
+<li class="search-profile-item">
+  <div class="search-enterprise-item">
+    <div class="search-enterprise-item-column-left">
+      <%= profile_image_link enterprise, :portrait, 'div',
+        @filter == 'more_recent' ? enterprise.send(@filter + '_label') + show_date(enterprise.created_at) : enterprise.send(@filter + '_label') %>
+    </div>
+    <div class="search-enterprise-item-column-right">
+      <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
+      <div class="search-enterprise-description">
+        <% if enterprise.description %>
+          <% body_stripped = strip_tags(enterprise.description) %>
+        <% elsif enterprise.home_page and enterprise.home_page.body %>
+          <% body_stripped = strip_tags(enterprise.home_page.body) %>
+        <% end %>
+        <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
+      </div>
+      <div class="search-enterprise-region">
+        <span class="search-enterprise-region-label"><%= _("City") %></span>
+        <% if enterprise.region %>
+          <span class="search-enterprise-region-name"><%= city_with_state(enterprise.region) %></span>
+        <% end %>
+      </div>
+
+      <div class="search-enterprise-categorization">
+        <% enterprise.top_level_categorization.each do |parent, children| %>
+          <div class="search-enterprise-category-<%=parent.id%> search-enterprise-category">
+            <span class="search-enterprise-categorization-parent"><%= parent.name %></span>
+            <span class="search-enterprise-categorization-children">
+              <%= children.collect(&:name).join(', ')  %>
+            </span>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <hr class="clearfix" />
+  </div>
+</li>
@@ -0,0 +1,25 @@
+<li class="search-event-item article-item">
+<%= link_to(event.title, event.url, :class => "search-result-title") %>
+<div class="search-content-first-column">
+  <%= render :partial => 'image', :object => event %>
+</div>
+<table class="noborder search-content-second-column">
+  <% if event.start_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('Start date') %></td>
+      <td class="article-item-date"><%= event.start_date %></td>
+    </tr>
+  <% end %>
+  <% if event.end_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('End date') %></td>
+      <td class="article-item-date"><%= event.end_date %></td>
+    </tr>
+  <% end %>
+
+  <%= render :partial => 'article_common', :object => event %>
+</table>
+<%= render :partial => 'article_last_change', :object => event %>
+
+<div style="clear: both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-folder-item article-item">
+  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => folder %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-folder-items">
+      <td class="search-field-label"><%= _("Last items") %></td>
+
+      <% r = folder.children.last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => folder %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => folder %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-forum-item article-item">
+  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => forum %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-forum-items">
+      <td class="search-field-label"><%= _("Last topics") %></td>
+
+      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => forum %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => forum %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,13 @@
+<li class="search-gallery article-item">
+  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => gallery %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => gallery %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => gallery %>
+
+  <div style="clear: both"></div>
+</li>
+
@@ -0,0 +1,85 @@
+<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { |content| instance_eval(&content) } %>
+<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
+
+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
+
+  <div class="search-product-item-first-column">
+    <%= render :partial => 'search/image', :object => product %>
+
+    <% if product.available %>
+      <% if product.price && product.price > 0 %>
+        <% has_discount = product.discount && product.discount > 0 %>
+        <% if product.price %>
+          <span class="search-product-price-textid"><%=_("from") if has_discount %></span><%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
+          <% if has_discount %>
+            <span class="search-product-price-textid"><%=_("by")%></span><%= price_span(product.price_with_discount, :class => "search-product-price") %>
+          <% end %>
+          <% if product.unit %>
+            <span class="search-product-unit">&nbsp;<%= _('/') %>&nbsp;<%= product.unit.name %></span>
+          <% end %>
+        <% end %>
+        <div class="search-product-inputs-info">
+          <% if p = product.percentage_from_solidarity_economy %>
+            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%= p[0].to_s %>"
+              title="<%=_('Percentage of inputs from solidarity economy')%>">
+              <%= p[1] %>
+            </div>
+          <% end %>
+
+          <% if product.price_described? %>
+            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
+              '<div class="search-product-input-dots-to-price">' +
+                '<div class="search-product-input-name">' + i.name + '</div>' +
+                price_span(i.price, :class => 'search-product-input-price') +
+              '</div>' }.join('') %>
+            <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
+          <% end %>
+        </div>
+      <% end %>
+    <% else %>
+      <span class="product-not-available"><%= _('Not available') %></div>
+    <% end %>
+
+  </div>
+  <div class="search-product-item-second-column">
+    <%= link_to_product product, :class => 'search-result-title' %>
+    <div class="search-product-supplier">
+      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+    </div>
+    <div class="search-product-description">
+      <% if product.description %>
+        <% desc_stripped = strip_tags(product.description) %>
+        <span class="search-field-label"><%= _('Description') %>  </span><%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
+      <% end %>
+    </div>
+  </div>
+  <div class="search-product-item-third-column">
+    <div class="search-product-region">
+      <% if product.enterprise.region %>
+        <span class="search-field-label"><%= _('City') %></span>
+        <br /><%= city_with_state(product.enterprise.region) %>
+      <% end %>
+    </div>
+    <div class="search-product-qualifiers">
+      <% if product.product_qualifiers.count > 0 %>
+        <span class="search-field-label"><%= _('Qualifiers') %></span>
+        <% product.product_qualifiers.each do |pq| %>
+          <% if pq.qualifier %>
+            <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
+          <% end %>
+          <% if pq.certifier %>
+            <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div style="clear: both"></div>
+
+  <%= extra_content.join('\n') %>
+  <% extra_properties.each do |property| %>
+    <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
+  <% end %>
+
+</li>
@@ -0,0 +1,13 @@
+<li class="search-text-article-item article-item">
+  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => text_article %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => text_article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => text_article %>
+
+  <div style="clear: both"></div>
+</li>
@@ -0,0 +1,25 @@
+<li class="search-uploaded-file-item article-item">
+  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => uploaded_file %>
+  </div>
+
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_author', :object => uploaded_file %>
+    <%= render :partial => 'article_description', :object => uploaded_file %>
+
+    <% if uploaded_file.parent and uploaded_file.parent.published? %>
+      <tr class="search-uploaded-file-parent">
+        <td class="search-field-label"><%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %></td>
+        <td><%= link_to uploaded_file.parent.name, uploaded_file.parent.url %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
+    <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => uploaded_file %>
+
+  <div style="clear:both"></div>
+</li>
@@ -1,13 +0,0 @@
-<li class="search-gallery article-item">
-  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => gallery %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <%= render :partial => 'article_common', :object => gallery %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => gallery %>
-
-  <div style="clear: both"></div>
-</li>
-
@@ -13,8 +13,8 @@
 <script type='text/javascript'>
   mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
-  <% @results.each do |name,results| %>
-    <% results.each do |item| %>
+  <% @searches.each do |name,search| %>
+    <% search[:results].each do |item| %>
       <% if item.lat && item.lng %>
         mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
           '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>');
@@ -0,0 +1,53 @@
+<div class="search-image-container">
+
+  <% if image.is_a? UploadedFile and image.filename %>
+    <% extension = image.extension %>
+    <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
+      <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
+      <% if image.width && image.height %>
+        <% javascript_tag do %>
+          image = jQuery('script').last().parent().find('.search-image-pic');
+          des_width = parseInt(image.css('width'));
+          des_height = parseInt(image.css('height'));
+
+          width = <%= image.width %>;
+          height = <%= image.height %>;
+          scale_factor = width > height ? des_width/width : des_height/height;
+
+          image.css({'width' : scale_factor*width +'px', 'height' : scale_factor*height+'px'});
+        <% end %>
+      <% end %>
+    <% elsif ['pdf'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-pdf' %>
+    <% elsif ['doc', 'docx', 'odt', 'rtf', 'txt', 'html', 'htm'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-text' %>
+    <% elsif ['xls', 'xlsx', 'ods', 'csv', 'tsv', 'tab'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-spreadsheet' %>
+    <% end %>
+  <% elsif image.is_a? Gallery %>
+    <div class="search-gallery-items">
+      <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
+      <% if r.length > 0 %>
+        <% r.each_index do |i| img = r[i] %>
+          <%= link_to '', img.view_url, :class => "search-image-pic pic-num#{i+1}",
+                                        :style => 'background-image: url(%s)'% img.public_filename(:thumb) %>
+        <% end %>
+      <% else %>
+        <div class="search-no-image"><span><%= _('No image') %></span></div>
+      <% end %>
+    </div>
+  <% elsif image.is_a? Product %>
+    <% if image.image %>
+    <div class="zoomable-image">
+      <%= link_to '', product_path(image), :class => "search-image-pic",
+          :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
+      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
+          :class => 'zoomify-image' %>
+    </div>
+    <% else %>
+      <div class="search-no-image"><span><%= _('No image') %></span></div>
+    <% end %>
+  <% else %>
+    <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
+  <% end %>
+</div>
@@ -1,53 +0,0 @@
-<div class="search-image-container">
-
-  <% if image.is_a? UploadedFile and image.filename %>
-    <% extension = image.extension %>
-    <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
-      <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
-      <% if image.width && image.height %>
-        <% javascript_tag do %>
-          image = jQuery('script').last().parent().find('.search-image-pic');
-          des_width = parseInt(image.css('width'));
-          des_height = parseInt(image.css('height'));
-
-          width = <%= image.width %>;
-          height = <%= image.height %>;
-          scale_factor = width > height ? des_width/width : des_height/height;
-
-          image.css({'width' : scale_factor*width +'px', 'height' : scale_factor*height+'px'});
-        <% end %>
-      <% end %>
-    <% elsif ['pdf'].include? extension %>
-      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-pdf' %>
-    <% elsif ['doc', 'docx', 'odt', 'rtf', 'txt', 'html', 'htm'].include? extension %>
-      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-text' %>
-    <% elsif ['xls', 'xlsx', 'ods', 'csv', 'tsv', 'tab'].include? extension %>
-      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-spreadsheet' %>
-    <% end %>
-  <% elsif image.is_a? Gallery %>
-    <div class="search-gallery-items">
-      <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
-      <% if r.length > 0 %>
-        <% r.each_index do |i| img = r[i] %>
-          <%= link_to '', img.view_url, :class => "search-image-pic pic-num#{i+1}",
-                                        :style => 'background-image: url(%s)'% img.public_filename(:thumb) %>
-        <% end %>
-      <% else %>
-        <div class="search-no-image"><span><%= _('No image') %></span></div>
-      <% end %>
-    </div>
-  <% elsif image.is_a? Product %>
-    <% if image.image %>
-    <div class="zoomable-image">
-      <%= link_to '', product_path(image), :class => "search-image-pic",
-          :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
-      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
-          :class => 'zoomify-image' %>
-    </div>
-    <% else %>
-      <div class="search-no-image"><span><%= _('No image') %></span></div>
-    <% end %>
-  <% else %>
-    <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
-  <% end %>
-</div>
@@ -1,85 +0,0 @@
-<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { |content| instance_eval(&content) } %>
-<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
-
-<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
-
-  <div class="search-product-item-first-column">
-    <%= render :partial => 'search/image', :object => product %>
-
-    <% if product.available %>
-      <% if product.price && product.price > 0 %>
-        <% has_discount = product.discount && product.discount > 0 %>
-        <% if product.price %>
-          <span class="search-product-price-textid"><%=_("from") if has_discount %></span><%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
-          <% if has_discount %>
-            <span class="search-product-price-textid"><%=_("by")%></span><%= price_span(product.price_with_discount, :class => "search-product-price") %>
-          <% end %>
-          <% if product.unit %>
-            <span class="search-product-unit">&nbsp;<%= _('/') %>&nbsp;<%= product.unit.name %></span>
-          <% end %>
-        <% end %>
-        <div class="search-product-inputs-info">
-          <% if p = product.percentage_from_solidarity_economy %>
-            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%= p[0].to_s %>"
-              title="<%=_('Percentage of inputs from solidarity economy')%>">
-              <%= p[1] %>
-            </div>
-          <% end %>
-
-          <% if product.price_described? %>
-            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
-              '<div class="search-product-input-dots-to-price">' +
-                '<div class="search-product-input-name">' + i.name + '</div>' +
-                price_span(i.price, :class => 'search-product-input-price') +
-              '</div>' }.join('') %>
-            <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
-          <% end %>
-        </div>
-      <% end %>
-    <% else %>
-      <span class="product-not-available"><%= _('Not available') %></div>
-    <% end %>
-
-  </div>
-  <div class="search-product-item-second-column">
-    <%= link_to_product product, :class => 'search-result-title' %>
-    <div class="search-product-supplier">
-      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
-    </div>
-    <div class="search-product-description">
-      <% if product.description %>
-        <% desc_stripped = strip_tags(product.description) %>
-        <span class="search-field-label"><%= _('Description') %>  </span><%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
-      <% end %>
-    </div>
-  </div>
-  <div class="search-product-item-third-column">
-    <div class="search-product-region">
-      <% if product.enterprise.region %>
-        <span class="search-field-label"><%= _('City') %></span>
-        <br /><%= city_with_state(product.enterprise.region) %>
-      <% end %>
-    </div>
-    <div class="search-product-qualifiers">
-      <% if product.product_qualifiers.count > 0 %>
-        <span class="search-field-label"><%= _('Qualifiers') %></span>
-        <% product.product_qualifiers.each do |pq| %>
-          <% if pq.qualifier %>
-            <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
-          <% end %>
-          <% if pq.certifier %>
-            <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
-          <% end %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-
-  <div style="clear: both"></div>
-
-  <%= extra_content.join('\n') %>
-  <% extra_properties.each do |property| %>
-    <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
-  <% end %>
-
-</li>
@@ -1,42 +0,0 @@
-<li class="search-profile-item">
-<% if @empty_query or multiple_search? or !profile.enterprise?  %>
-  <%= profile_image_link profile, :portrait, 'div',
-    @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
-<% else %>
-  <div class="search-enterprise-item">
-    <div class="search-enterprise-item-column-left">
-      <%= profile_image_link profile, :portrait, 'div' %>
-    </div>
-    <div class="search-enterprise-item-column-right">
-      <%= link_to_homepage(profile.name, profile.identifier, :class => "search-result-title") %>
-      <div class="search-enterprise-description">
-        <% if profile.description %>
-          <% body_stripped = strip_tags(profile.description) %>
-        <% elsif profile.home_page and profile.home_page.body %>
-          <% body_stripped = strip_tags(profile.home_page.body) %>
-        <% end %>
-        <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
-      </div>
-      <div class="search-enterprise-region">
-        <span class="search-enterprise-region-label"><%= _("City") %></span>
-        <% if profile.region %>
-          <span class="search-enterprise-region-name"><%= city_with_state(profile.region) %></span>
-        <% end %>
-      </div>
-
-      <div class="search-enterprise-categorization">
-        <% profile.top_level_categorization.each do |parent, children| %>
-          <div class="search-enterprise-category-<%=parent.id%> search-enterprise-category">
-            <span class="search-enterprise-categorization-parent"><%= parent.name %></span>
-            <span class="search-enterprise-categorization-children">
-              <%= children.collect(&:name).join(', ')  %>
-            </span>
-          </div>
-        <% end %>
-      </div>
-    </div>
-
-    <hr class="clearfix" />
-  </div>
-<% end %>
-</li>
-<div class="search-results-header <%= "search-no-results" if @results[@asset].nil? or @results[@asset].length == 0 %>">
-  <% if !@empty_query %>
-    <div class="search-results-header-information">
-      <% if @results[@asset].total_entries > 0 %>
-        <%= label_total_found(@asset, @results[@asset].total_entries) %>
-        <% if params[:display] != 'map' %>
-          <span class="current-page"><%= _("Showing page %s of %s") % [@results[@asset].current_page, @results[@asset].total_pages] %></span>
-        <% end %>
-      <% end %>
-    </div>
-
-    <div class="search-results-header-facets-order-by">
-      <%= facets_unselect_menu(@asset) %>
-      <%= order_by(@asset) if params[:display] != 'map' %>
-    </div>
-  <% else %>
-    <div id='search-filter-title'><%= @filter_title if @filter_title %></div>
-  <% end %>
-
+<div class="search-results-header <%= "search-no-results" if @searches[@asset].nil? or @searches[@asset].length == 0 %>">
+  <div id='search-filter-title'><%= filter_title(@asset, @filter) %></div>
+  <%= display_selector(@asset, params[:display]) %>
+  <%= filter_selector(@asset, @filter) %>
   <div style="clear: both"></div>
 </div>
@@ -4,16 +4,7 @@
                  :method => 'get', :class => 'search_form' ) do %>
     <%= hidden_field_tag :display, params[:display] %>
-
-    <% params_uri = CGI::unescape(request.request_uri) %>
-    <% if params_uri.index('?') %>
-      <% params_uri[(params_uri.index('?')+1)..-1].to_s.split("&").each do |part| %>
-        <% if part.start_with? "facet" %>
-          <% name_value = part.split("=") %>
-          <%= hidden_field_tag name_value[0], name_value[1] %>
-        <% end %>
-      <% end %>
-    <% end %>
+    <%= hidden_field_tag :filter, params[:filter] %>
     <div class="search-field">
       <span class="formfield">
@@ -24,6 +15,8 @@
       <%= submit_button(:search, _('Search')) %>
     </div>
+    <%= render :partial => 'search_form_extra_fields' %>
+
   <% end %>
   <% if @empty_query %>
@@ -0,0 +1,6 @@
+<%#
+  This partial serves the search engine plugins to fill in any extra
+  fields they need in the search form. The search engine plugin must define a
+  partial named like this one and the plugin's view path will override the
+  default view path which will render the plugin file instead of this one.
+%>
@@ -1,13 +0,0 @@
-<li class="search-text-article-item article-item">
-  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
-
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => text_article %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <%= render :partial => 'article_common', :object => text_article %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => text_article %>
-
-  <div style="clear: both"></div>
-</li>
@@ -1,25 +0,0 @@
-<li class="search-uploaded-file-item article-item">
-  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
-
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => uploaded_file %>
-  </div>
-
-  <table class="noborder search-content-second-column">
-    <%= render :partial => 'article_author', :object => uploaded_file %>
-    <%= render :partial => 'article_description', :object => uploaded_file %>
-
-    <% if uploaded_file.parent and uploaded_file.parent.published? %>
-      <tr class="search-uploaded-file-parent">
-        <td class="search-field-label"><%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %></td>
-        <td><%= link_to uploaded_file.parent.name, uploaded_file.parent.url %></td>
-      </tr>
-    <% end %>
-
-    <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
-    <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => uploaded_file %>
-
-  <div style="clear:both"></div>
-</li>
@@ -0,0 +1 @@
+search_page.html.erb
 \ No newline at end of file
@@ -1,17 +0,0 @@
-<%= search_page_title( @titles[:articles], @category ) %>
-
-<div id="search-column-left">
-  <% if !@empty_query %>
-    <%= facets_menu(:articles, @facets) %>
-  <% end %>
-</div>
-
-<div id="search-column-right">
-  <%= render :partial => 'search_form', :locals => { :hint => _('Type the title, author or content desired') } %>
-  <%= render :partial => 'results_header' %>
-
-  <%= display_results %>
-  <%= pagination_links @results[:articles] %>
-</div>
-
-<div style="clear: both"></div>
@@ -1 +0,0 @@
-index.rhtml
 \ No newline at end of file
@@ -0,0 +1,28 @@
+<div id="search-page" class="<%= "view-category" if @category %>">
+
+  <% if @category %>
+    <div id="category-image"><%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %></div>
+  <% end %>
+
+  <h1><%= _("Category Index") %></h1>
+  <%= category_context(@category, params) %>
+  <%= display_results @searches %>
+
+  <div id="category-childs">
+    <% if @category %>
+      <h2> <%= _('Sub-categories')  %> </h2>
+      <% if @category.children.empty? %>
+        <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
+      <% else %>
+        <ul>
+          <% @category.children.each do |c| %>
+            <li> <%= link_to_category c, false %> </li>
+          <% end %>
+        </ul>
+      <% end %>
+    <% end %>
+  </div>
+
+</div>
+
+<div style="clear: both"></div>
@@ -0,0 +1 @@
+search_page.html.erb
 \ No newline at end of file
@@ -1,25 +0,0 @@
-<%= search_page_title( @titles[:communities], @category ) %>
-
-<div id='search-column-left'>
-  <% if logged_in? %>
-    <% button_bar do %>
-      <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
-    <% end %>
-  <% end %>
-
-  <% if !@empty_query %>
-    <%= facets_menu(:communities, @facets) %>
-  <% end %>
-</div>
-
-<div id='search-column-right'>
-  <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the community you're looking for") } %>
-  <%= render :partial => 'results_header' %>
-
-  <%= display_results %>
-  <%= pagination_links @results.values.first %>
-</div>
-
-<div style="clear: both"></div>
-
@@ -1 +0,0 @@
-articles.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+search_page.html.erb
 \ No newline at end of file
@@ -1,28 +0,0 @@
-<%= search_page_title( @titles[:enterprises], @category ) %>
-
-<div id="search-column-left">
-  <% if logged_in? && environment.enabled?('enterprise_registration') %>
-    <% button_bar do %>
-      <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
-    <% end %>
-  <% end %>
-
-  <% if !@empty_query %>
-    <% button_bar do %>
-      <%= display_map_list_button %>
-    <% end %>
-    <%= facets_menu(:enterprises, @facets) %>
-  <% end %>
-</div>
-
-<div id="search-column-right">
-  <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the enterprise you're looking for") } %>
-  <%= render :partial => 'results_header' %>
-
-  <%= display_results(true) %>
-  <% if params[:display] != 'map' %>
-    <%= pagination_links @results[:enterprises] %>
-  <% end %>
-</div>
-
-<div style="clear: both"></div>
@@ -0,0 +1 @@
+<%= render :partial => 'events/agenda' %>
@@ -1,3 +0,0 @@
-<%= search_page_title( Environment.default.name + "'s " + @titles[:events], @category ) %>
-
-<%= render :partial => 'events/agenda' %>
@@ -1,8 +0,0 @@
-<% results = @asset_class.map_facet_results(@facet, params[:facet], @facets, @all_facets) %>
-
-<% array = [] %>
-<% @asset_class.facet_result_sort(@facet, results, :alphabetically).each do |id, label, count| %>
-  <% array << {:id => id, :name => facet_link_html(@facet, params.merge(:controller => 'search', :action => @asset), id, label, count)} %>
-<% end %>
-
-<%= facet_javascript('facet-input-'+@facet[:id].to_s, @facet, array) %>
@@ -7,7 +7,7 @@
   <%= search_page_title(_('Search Results'), @category) %>
   <%= render :partial => 'search_form', :locals => { :hint => '' } %>
   <%= category_context(@category, params) %>
-  <%= display_results %>
+  <%= display_results(@searches, @asset) %>
   <div id="category-childs">
     <% if @category %>
@@ -0,0 +1 @@
+search_page.html.erb
 \ No newline at end of file
@@ -1,19 +0,0 @@
-<%= search_page_title( @titles[:people], @category ) %>
-
-<div id='search-column-left'>
-  <% if !@empty_query %>
-    <%= facets_menu(:people, @facets) %>
-  <% end %>
-</div>
-
-<div id='search-column-right'>
-  <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the person you're looking for") } %>
-  <%= render :partial => 'results_header' %>
-
-  <%= display_results %>
-  <% if params[:display] != 'map' %>
-    <%= pagination_links @results.values.first %>
-  <% end %>
-</div>
-
-<div style="clear: both"></div>
@@ -0,0 +1 @@
+search_page.html.erb
 \ No newline at end of file
@@ -1,26 +0,0 @@
-<%= search_page_title( @titles[:products], @category ) %>
-
-<div id="search-column-left">
-  <% if !@empty_query %>
-    <% button_bar do %>
-    <%= display_map_list_button %>
-<% end %>
-  <%= facets_menu(:products, @facets) %>
-<% end %>
-</div>
-
-<div id="search-column-right">
-  <%= render :partial => 'search_form', :locals => { :hint => _('Type the product, service, city or qualifier desired') } %>
-  <%= render :partial => 'results_header' %>
-
-  <%= display_results(true) %>
-  <% if !@one_page and params[:display] != 'map' %>
-    <%= pagination_links @results[:products] %>
-<% end %>
-</div>
-
-<% javascript_tag do %>
-  jQuery('.search-product-price-details').altBeautify();
-<% end %>
-
-<div style="clear: both"></div>
@@ -0,0 +1,17 @@
+<%= search_page_title( @titles[@asset], @category ) %>
+
+<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
+<%= render :partial => 'results_header' %>
+
+<%= display_results(@searches, @asset) %>
+<% if params[:display] != 'map' %>
+  <%= pagination_links @searches[@asset][:results] %>
+<% end %>
+
+<div style="clear: both"></div>
+
+<% if @asset == :product %>
+  <% javascript_tag do %>
+    jQuery('.search-product-price-details').altBeautify();
+  <% end %>
+<% end %>
@@ -7,7 +7,7 @@
 <% end %>
 <% cache_timeout(@tag_cache_key, 4.hour) do %>
-  <%= display_results %>
+  <%= display_results @searches %>
   <div style="clear: both"></div>
 <% end %>
@@ -50,13 +50,13 @@
   <% fields_for "tasks[#{task.id}][task]", task do |f| %>
     <% if task.accept_details %>
       <div id="on-accept-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
     <% if task.reject_details %>
       <div id="on-reject-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
   <% end %>
 # locally-developed modules
-require 'acts_as_faceted'
 require 'acts_as_filesystem'
 require 'acts_as_having_settings'
-require 'acts_as_searchable'
 require 'acts_as_having_boxes'
 require 'acts_as_having_image'
 require 'acts_as_having_posts'
@@ -1,25 +0,0 @@
-# Config file for the acts_as_solr plugin.
-#
-# If you change the host or port number here, make sure you update
-# them in your Solr config file
-
-# No change is needed to support multitenancy. Only one solr environment will be used.
-# Just remember to use 'rake multitenancy:reindex' for reindexation.
-
-production:
-  url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
-  timeout: 0
-
-development:
-  url: http://0.0.0.0:8982/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-test: &TEST
-  url: http://0.0.0.0:8981/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-cucumber:
-  <<: *TEST
@@ -28,7 +28,6 @@ public                            usr/share/noosfero
 debian/default/noosfero           etc/default
 etc/init.d/noosfero               etc/init.d
-debian/solr.yml                   etc/noosfero
 debian/thin.yml                   etc/noosfero
 etc/logrotate.d/noosfero          etc/logrotate.d
 debian/noosfero.yml               etc/noosfero
@@ -2,7 +2,6 @@ usr/share/rails-ruby1.8                             usr/share/noosfero/vendor/ra
 var/tmp/noosfero                                    usr/share/noosfero/tmp
 var/log/noosfero                                    usr/share/noosfero/log
 etc/noosfero/database.yml                           usr/share/noosfero/config/database.yml
-etc/noosfero/solr.yml                               usr/share/noosfero/config/solr.yml
 etc/noosfero/thin.yml                               usr/share/noosfero/config/thin.yml
 etc/noosfero/plugins                                usr/share/noosfero/config/plugins
 etc/noosfero/noosfero.yml                           usr/share/noosfero/config/noosfero.yml
@@ -1,22 +0,0 @@
-# Config file for the acts_as_solr plugin.
-#
-# If you change the host or port number here, make sure you update
-# them in your Solr config file
-
-development:
-  url: http://0.0.0.0:8982/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-production:
-  url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
-  timeout: 0
-
-test: &TEST
-  url: http://0.0.0.0:8981/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-cucumber:
-  <<: *TEST
@@ -45,14 +45,13 @@ if [ -z &quot;$NOOSFERO_DIR&quot; ] || [ -z &quot;$NOOSFERO_USER&quot; ]; then
 fi
 ######################
-SOLR_PID_FILE=$NOOSFERO_DIR/tmp/pids/solr.production.pid
 main_script() {
   cd $NOOSFERO_DIR
   if [ "$NOOSFERO_USER" != "$USER" ]; then
-    su $NOOSFERO_USER -l -c "SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1"
+    su $NOOSFERO_USER -l -c "./script/production $1"
   else
-    SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1
+    ./script/production $1
   fi
 }
@@ -78,13 +77,6 @@ do_setup() {
     chmod 750 /var/tmp/noosfero
   fi
-  # Solr directory
-  if [ ! -d /var/tmp/noosfero/solr ]; then
-    mkdir -p /var/tmp/noosfero/solr
-    chown $NOOSFERO_USER:root /var/tmp/noosfero/solr
-    chmod 750 /var/tmp/noosfero/solr
-  fi
-
   # symlink the directories into Noosfero directory
   if [ ! -e $NOOSFERO_DIR/tmp ]; then
     ln -s /var/tmp/noosfero $NOOSFERO_DIR/tmp
@@ -98,28 +90,21 @@ do_setup() {
 }
 do_start() {
-
-  # FIXME should not test for solr only
-  if [ -e $SOLR_PID_FILE ]; then
-    echo 'noosfero already running, cannot start.'
-    exit 2
+  if ! running; then
+    do_setup
+    # actually start the service
+    main_script start
+  else
+    echo 'Noosfero is already running, nothing to do...'
   fi
-
-  do_setup
-
-  # actually start the service
-  main_script start
 }
 do_stop() {
-
-  # FIXME should not test for solr only
-  if [ ! -e $SOLR_PID_FILE ]; then
-    echo 'noosfero not running, cannot stop'
-    exit 2
+  if running; then
+    main_script stop
+  else
+    echo 'Noosfero is already stopped, nothing to do...'
   fi
-
-  main_script stop
 }
 do_restart() {
@@ -127,6 +112,10 @@ do_restart() {
   do_start
 }
+running(){
+  pgrep -u noosfero -f server > /dev/null
+}
+
 case "$1" in
   start|stop|restart|setup)
     do_$1
@@ -5,8 +5,6 @@
 # files.
 ENV["RAILS_ENV"] ||= "cucumber"
-abort unless system 'rake -s solr:start'
-at_exit { system 'rake -s solr:stop' }
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
@@ -8,7 +8,6 @@ config/database.yml
 config/session.secret
 config/noosfero.yml
 config/mongrel_cluster.yml
-config/solr.yml
 config/plugins
 config/thin.yml
 config/local.rb
@@ -32,7 +31,6 @@ doc/noosfero/*.xhtml
 doc/noosfero/*/*.xhtml
 tags
 pkg
-solr
 *~
 *.swp
 debian/*.log
@@ -1,222 +0,0 @@
-module ActsAsFaceted
-
-  module ClassMethods
-  end
-
-  module ActsMethods
-    # Example:
-    #
-    #acts_as_faceted :fields => {
-    #  :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
-    #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
-    #    '[NOW-1YEARS TO NOW/DAY]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("Last day")}},
-    #  :f_profile_type => {:label => _('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
-    #  :f_category => {:label => _('Categories')}},
-    #  :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
-    #
-    #acts_as_searchable :additional_fields => [ {:name => {:type => :string, :as => :name_sort, :boost => 5.0}} ] + facets_fields_for_solr,
-    #  :exclude_fields => [:setting],
-    #  :include => [:profile],
-    #  :facets => facets_option_for_solr,
-    #  :if => proc{|a| ! ['RssFeed'].include?(a.class.name)}
-    def acts_as_faceted(options)
-      extend ClassMethods
-      extend ActsAsSolr::CommonMethods
-
-      cattr_accessor :facets
-      cattr_accessor :facets_order
-      cattr_accessor :to_solr_fields_names
-      cattr_accessor :facets_results_containers
-      cattr_accessor :solr_fields_names
-      cattr_accessor :facets_option_for_solr
-      cattr_accessor :facets_fields_for_solr
-      cattr_accessor :facet_category_query
-
-      self.facets = options[:fields]
-      self.facets_order = options[:order] || self.facets.keys
-      self.facets_results_containers = {:fields => 'facet_fields', :queries => 'facet_queries', :ranges => 'facet_ranges'}
-      self.facets_option_for_solr = Hash[facets.select{ |id,data| ! data.has_key?(:queries) }].keys
-      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} }
-      self.solr_fields_names = facets.map{ |id,data| id.to_s + '_' + get_solr_field_type(data[:type] || :facet) }
-      self.facet_category_query = options[:category_query]
-
-      # A hash to retrieve the field key for the solr facet string returned
-      # :field_name => "field_name_facet"
-      self.to_solr_fields_names = Hash[facets.keys.zip(solr_fields_names)]
-
-      def facet_by_id(id)
-        {:id => id}.merge(facets[id]) if facets[id]
-      end
-
-      def map_facets_for(environment)
-        facets_order.map do |id|
-          facet = facet_by_id(id)
-          next if facet[:type_if] and !facet[:type_if].call(self.new)
-
-          if facet[:multi]
-            facet[:label].call(environment).map do |label_id, label|
-              facet.merge({:id => facet[:id].to_s+'_'+label_id.to_s, :solr_field => facet[:id], :label_id => label_id, :label => label})
-            end
-          else
-            facet.merge(:id => facet[:id].to_s, :solr_field => facet[:id])
-          end
-        end.compact.flatten
-      end
-
-      def map_facet_results(facet, facet_params, facets_data, unfiltered_facets_data = {}, options = {})
-        raise 'Use map_facets_for before this method' if facet[:solr_field].nil?
-        facets_data = {} if facets_data.blank? # could be empty array
-        solr_facet = to_solr_fields_names[facet[:solr_field]]
-        unfiltered_facets_data ||= {}
-
-        if facet[:queries]
-          container = facets_data[facets_results_containers[:queries]]
-          facet_data = (container.nil? or container.empty?) ? [] : container.select{ |k,v| k.starts_with? solr_facet }
-          container = unfiltered_facets_data[facets_results_containers[:queries]]
-          unfiltered_facet_data = (container.nil? or container.empty?) ? [] : container.select{ |k,v| k.starts_with? solr_facet }
-        else
-          container = facets_data[facets_results_containers[:fields]]
-          facet_data = (container.nil? or container.empty?) ? [] : container[solr_facet] || []
-          container = unfiltered_facets_data[facets_results_containers[:fields]]
-          unfiltered_facet_data = (container.nil? or container.empty?) ? [] : container[solr_facet] || []
-        end
-
-        if !unfiltered_facets_data.blank? and !facet_params.blank?
-          f = Hash[Array(facet_data)]
-          zeros = []
-          facet_data = unfiltered_facet_data.map do |id, count|
-            count = f[id]
-            if count.nil?
-              zeros.push [id, 0]
-              nil
-            else
-              [id, count]
-            end
-          end.compact + zeros
-        end
-
-        facet_count = facet_data.length
-
-        if facet[:queries]
-          result = facet_data.map do |id, count|
-            q = id[id.index(':')+1,id.length]
-            label = facet_result_name(facet, q)
-            [q, label, count] if count > 0
-          end.compact
-          result = facet[:queries_order].map{ |id| result.detect{ |rid, label, count| rid == id } }.compact if facet[:queries_order]
-        elsif facet[:proc]
-          if facet[:label_id]
-            result = facet_data.map do |id, count|
-              name = facet_result_name(facet, id)
-              [id, name, count] if name
-            end.compact
-            # FIXME limit is NOT improving performance in this case :(
-            facet_count = result.length
-            result = result.first(options[:limit]) if options[:limit]
-          else
-            facet_data = facet_data.first(options[:limit]) if options[:limit]
-            result = facet_data.map { |id, count| [id, facet_result_name(facet, id), count] }
-          end
-        else
-          facet_data = facet_data.first(options[:limit]) if options[:limit]
-          result = facet_data.map { |id, count| [id, facet_result_name(facet, id), count] }
-        end
-
-        sorted = facet_result_sort(facet, result, options[:sort])
-
-        # length can't be used if limit option is given;
-        # total_entries comes to help
-        sorted.class.send(:define_method, :total_entries, proc { facet_count })
-
-        sorted
-      end
-
-      def facet_result_sort(facet, facets_data, sort_by = nil)
-        if facet[:queries_order]
-          facets_data
-        elsif sort_by == :alphabetically
-          facets_data.sort{ |a,b| Array(a[1])[0] <=> Array(b[1])[0] }
-        elsif sort_by == :count
-          facets_data.sort{ |a,b| -1*(a[2] <=> b[2]) }
-        else
-          facets_data
-        end
-      end
-
-      def facet_result_name(facet, data)
-        if facet[:queries]
-          gettext(facet[:queries][data])
-        elsif facet[:proc]
-          if facet[:multi]
-            facet[:label_id] ||= 0
-            facet[:proc].call(facet, data)
-          else
-            gettext(facet[:proc].call(data))
-          end
-        else
-          data
-        end
-      end
-
-      def facet_label(facet)
-        return nil unless facet
-        _(facet[:label])
-      end
-
-      def facets_find_options(facets_selected = {}, options = {})
-        browses = []
-        facets_selected ||= {}
-        facets_selected.map do |id, value|
-          next unless facets[id.to_sym]
-          if value.kind_of?(Hash)
-            value.map do |label_id, value|
-              value.to_a.each do |value|
-                browses << id.to_s + ':' + (facets[id.to_sym][:queries] ? value : '"'+value.to_s+'"')
-              end
-            end
-          else
-            browses << id.to_s + ':' + (facets[id.to_sym][:queries] ? value : '"'+value.to_s+'"')
-          end
-        end.flatten
-
-        {:facets => {:zeros => false, :sort => :count,
-            :fields => facets_option_for_solr,
-            :browse => browses,
-            :query => facets.map { |f, options| options[:queries].keys.map { |q| f.to_s + ':' + q } if options[:queries] }.compact.flatten,
-          }
-        }
-      end
-    end
-  end
-
-end
-
-ActiveRecord::Base.extend ActsAsFaceted::ActsMethods
-
-# from https://github.com/rubyworks/facets/blob/master/lib/core/facets/enumerable/graph.rb
-module Enumerable
-  def graph(&yld)
-    if yld
-      h = {}
-      each do |*kv|
-        r = yld[*kv]
-        case r
-        when Hash
-          nk, nv = *r.to_a[0]
-        when Range
-          nk, nv = r.first, r.last
-        else
-          nk, nv = *r
-        end
-        h[nk] = nv
-      end
-      h
-    else
-      Enumerator.new(self,:graph)
-    end
-  end
-
-  # Alias for #graph, which stands for "map hash".
-  alias_method :mash, :graph
-end
-
@@ -1,87 +0,0 @@
-module ActsAsSearchable
-
-  module ClassMethods
-    ACTS_AS_SEARCHABLE_ENABLED = true unless defined? ACTS_AS_SEARCHABLE_ENABLED
-
-    def acts_as_searchable(options = {})
-      return if !ACTS_AS_SEARCHABLE_ENABLED
-
-      if options[:fields]
-        options[:fields] << {:schema_name => :string}
-      else
-        options[:additional_fields] ||= []
-        options[:additional_fields] << {:schema_name => :string}
-      end
-
-      acts_as_solr options
-      extend FindByContents
-      send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-      def schema_name
-        self.class.schema_name
-      end
-
-      # replace solr_id from vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
-      # to include schema_name
-      def solr_id
-         id = "#{self.class.name}:#{record_id(self)}"
-         id.insert(0, "#{schema_name}:") unless schema_name.blank?
-         id
-      end
-    end
-
-    module FindByContents
-
-      def schema_name
-        (Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?) ? ActiveRecord::Base.connection.schema_search_path : ''
-      end
-
-      def find_by_contents(query, pg_options = {}, options = {}, db_options = {})
-        pg_options[:page] ||= 1
-        pg_options[:per_page] ||= 20
-        options[:page] = pg_options[:page].to_i
-        options[:per_page] = pg_options[:per_page].to_i
-        options[:scores] ||= true
-        options[:filter_queries] ||= []
-        options[:filter_queries] << "schema_name:\"#{schema_name}\"" unless schema_name.blank?
-        all_facets_enabled = options.delete(:all_facets)
-        options[:per_page] = options.delete(:extra_limit) if options[:extra_limit]
-        results = []
-        facets = all_facets = {}
-
-        solr_result = find_by_solr(query, options)
-        if all_facets_enabled
-          options[:facets][:browse] = nil
-          all_facets = find_by_solr(query, options.merge(:per_page => 0)).facets
-        end
-
-        if !solr_result.nil?
-          facets = options.include?(:facets) ? solr_result.facets : []
-
-          if db_options.empty?
-            results = solr_result
-          else
-            ids = solr_result.results.map{ |r| r[:id].to_i }
-            if ids.empty?
-              ids << -1
-            end
-
-            if db_options[:conditions]
-              db_options[:conditions] = sanitize_sql_for_conditions(db_options[:conditions]) + " and #{table_name}.id in (#{ids.join(', ')})"
-            else
-              db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})"
-            end
-
-            results = find(:all, db_options)
-          end
-        end
-
-        {:results => results, :facets => facets, :all_facets => all_facets}
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:extend, ActsAsSearchable::ClassMethods)
@@ -13,4 +13,17 @@ class ActiveRecord::Base
     key.join('/')
   end
+  def self.like_search(query)
+    if defined?(self::SEARCHABLE_FIELDS)
+      fields = self::SEARCHABLE_FIELDS.keys.map(&:to_s) & column_names
+      query = query.downcase.strip
+      conditions = fields.map do |field|
+        "lower(#{table_name}.#{field}) LIKE '%#{query}%'"
+      end.join(' OR ')
+      where(conditions)
+    else
+      raise "No searchable fields defined for #{self.name}"
+    end
+  end
+
 end
@@ -16,38 +16,52 @@ class Noosfero::Plugin
       if Rails.env.test? && !enabled_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
         enabled_plugins << File.join(Rails.root, 'plugins', 'foo')
       end
+
       enabled_plugins.select do |entry|
         File.directory?(entry)
       end.each do |dir|
-        plugin_name = File.basename(dir)
-
-        plugin_dependencies_ok = true
-        plugin_dependencies_file = File.join(dir, 'dependencies.rb')
-        if File.exists?(plugin_dependencies_file)
-          begin
-            require plugin_dependencies_file
-          rescue LoadError => ex
-            plugin_dependencies_ok = false
-            $stderr.puts "W: Noosfero plugin #{plugin_name} failed to load (#{ex})"
-          end
-        end
+        load_plugin dir
+      end
+    end
-        if plugin_dependencies_ok
-          Rails.configuration.controller_paths << File.join(dir, 'controllers')
-          ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
-          controllers_folders = %w[public profile myprofile admin]
-          controllers_folders.each do |folder|
-            Rails.configuration.controller_paths << File.join(dir, 'controllers', folder)
-            ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers', folder)
-          end
-          [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
-            path << File.join(dir, 'models')
-            path << File.join(dir, 'lib')
-          end
-
-          klass(plugin_name)
+    def load_plugin dir
+      plugin_name = File.basename(dir)
+
+      plugin_dependencies_ok = true
+      plugin_dependencies_file = File.join(dir, 'dependencies.rb')
+      if File.exists?(plugin_dependencies_file)
+        begin
+          require plugin_dependencies_file
+        rescue LoadError => ex
+          plugin_dependencies_ok = false
+          $stderr.puts "W: Noosfero plugin #{plugin_name} failed to load (#{ex})"
         end
       end
+
+      return unless plugin_dependencies_ok
+
+      # add load paths
+      Rails.configuration.controller_paths << File.join(dir, 'controllers')
+      ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
+      controllers_folders = %w[public profile myprofile admin]
+      controllers_folders.each do |folder|
+        Rails.configuration.controller_paths << File.join(dir, 'controllers', folder)
+        ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers', folder)
+      end
+      [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
+        path << File.join(dir, 'models')
+        path << File.join(dir, 'lib')
+      end
+
+      # load vendor/plugins
+      Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
+        [ ActiveSupport::Dependencies.load_paths, $:].each{ |path| path << "#{vendor_plugin}/lib" }
+        init = "#{vendor_plugin}/init.rb"
+        require init.gsub(/.rb$/, '') if File.file? init
+      end
+
+      # load class
+      klass(plugin_name)
     end
     def all
@@ -380,6 +394,13 @@ class Noosfero::Plugin
     nil
   end
+  # -> Finds objects by their contents
+  # returns = {:results => [a, b, c, ...], ...}
+  # P.S.: The plugin might add other informations on the return hash for its
+  # own use in specific views
+  def find_by_contents(asset, scope, query, paginate_options={}, options={})
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
@@ -23,12 +23,36 @@ class Noosfero::Plugin::Manager
     dispatch_without_flatten(event, *args).flatten
   end
+  def dispatch_plugins(event, *args)
+    map { |plugin| plugin.class if plugin.send(event, *args) }.compact.flatten
+  end
+
   def dispatch_without_flatten(event, *args)
     map { |plugin| plugin.send(event, *args) }.compact
   end
   alias :dispatch_scopes :dispatch_without_flatten
+  def first(event, *args)
+    result = nil
+    each do |plugin|
+      result = plugin.send(event, *args)
+      break if result.present?
+    end
+    result
+  end
+
+  def first_plugin(event, *args)
+    result = nil
+    each do |plugin|
+      if plugin.send(event, *args)
+        result = plugin.class
+        break
+      end
+    end
+    result
+  end
+
   def enabled_plugins
     @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
       p = plugin.constantize.new
@@ -11,6 +11,7 @@ module SetProfileRegionFromCityState
   end
   module InstanceMethods
+    include Noosfero::Plugin::HotSpot
     def city_with_region=(value)
       self.city_without_region = value
@@ -24,16 +25,20 @@ module SetProfileRegionFromCityState
     def region_from_city_and_state
       if @change_region
-        s = State.find_by_contents(self.state)[:results].first
-        if s
-          c = City.find_by_contents(self.city, {}, :filter_queries => ["parent_id:#{s.id}"])[:results].first
-          self.region = c
-        else
-          self.region = nil
-        end
+        self.region = nil
+        state = search_region(State, self.state)
+        self.region = search_region(City.where(:parent_id => state.id), self.city) if state
       end
     end
+    private
+
+    def search_region(scope, query)
+      return nil if !query
+      query = query.downcase.strip
+      scope.where(['lower(name)=? OR lower(abbreviation)=? OR lower(acronym)=?', query, query, query]).first
+    end
+
   end
 end
@@ -14,22 +14,6 @@ namespace :multitenancy do
     (file_envs - db_envs.map{ |e| e + '.rb' }).each { |env| safe_unlink env }
   end
-  task :reindex => :environment do
-    # enable output from rebuild_index
-    logger = ActiveRecord::Base.logger = Logger.new(STDOUT)
-    logger.level = ActiveSupport::BufferedLogger::INFO
-
-    db_envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_#{RAILS_ENV}$/) }
-    db_envs.each do |e|
-      puts "Rebuilding index for environment #{e}"
-      ActiveRecord::Base.connection.schema_search_path = ActiveRecord::Base.configurations[e]['schema_search_path']
-      $solr_indexed_models.each do |m|
-        puts "Rebuilding index for model #{m}"
-        m.rebuild_index
-      end
-    end
-  end
-
 end
 namespace :db do
 namespace :noosfero do
+  def pendencies_on_authors
+    sh "git status | grep 'AUTHORS'" do |ok, res| 
+      return {:ok => ok, :res => res}
+    end
+  end
+
+  def pendencies_on_repo
+    sh "git status | grep 'nothing.*commit'" do |ok, res| 
+      return {:ok => ok, :res => res}
+    end
+  end
+
   desc 'checks if there are uncommitted changes in the repo'
   task :check_repo do
-    sh "git status | grep 'nothing.*commit'" do |ok, res|
-      if !ok
-        raise "******** There are uncommited changes in the repository, cannot continue"
-      end
+    if !pendencies_on_repo[:ok]
+      raise "******** There are uncommited changes in the repository, cannot continue"
     end
   end
@@ -85,6 +95,80 @@ EOF
       rm_f 'AUTHORS'
       raise e
     end
+    if pendencies_on_authors[:res]
+      puts 'The AUTHORS file was updated!'
+      sh 'git diff AUTHORS'
+      if confirm('Do you want to commit this changes to the author file')
+        default_message = 'Updating AUTHORS file'
+        message = ask("Commit message [#{default_message}]:")
+        message = message.present? ? message : default_message
+        sh 'git add AUTHORS'
+        sh "git commit -m '#{message}'"
+      end
+    end
+  end
+
+  def ask(message)
+    print message
+    STDIN.gets.chomp
+  end
+
+  def confirm(message, default=true)
+    choice_message = default ? ' [Y/n]? ' : ' [y/N]? '
+    choice = nil
+    while choice.nil?
+      answer = ask(message + choice_message)
+      if answer.blank?
+        choice = default
+      elsif ['y', 'yes'].include?(answer.downcase)
+        choice = true
+      elsif ['n', 'no'].include?(answer.downcase)
+        choice = false
+      end
+    end
+    choice
+  end
+
+  desc 'sets the new version on apropriate files'
+  task :set_version, :release_kind do |t, args|
+    next if File.exist?("tmp/pending-release")
+    release_kind = args[:release_kind] || 'stable'
+
+    if release_kind == 'test'
+      version_question = "Release candidate of which version: "
+      distribution = 'squeeze-test'
+    else
+      version_question = "Version that is being released: "
+      distribution = 'unstable'
+    end
+
+    version_name = new_version = ask(version_question)
+
+    if release_kind == 'test'
+      timestamp = Time.now.strftime('%Y%m%d%H%M%S')
+      version_name += "~rc#{timestamp}"
+    end
+    release_message = ask("Release message: ")
+
+    sh 'git checkout debian/changelog lib/noosfero.rb'
+    sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{version_name}'/\" lib/noosfero.rb"
+    sh "dch --newversion #{version_name} --distribution #{distribution} --force-distribution '#{release_message}'"
+
+    puts
+    if confirm("Commit version bump to #{version_name} on #{distribution} distribution")
+      sh 'git add debian/changelog lib/noosfero.rb'
+      sh "git commit -m 'Bumping version #{version_name}'"
+      sh "touch tmp/pending-release"
+    else
+      sh 'git checkout debian/changelog lib/noosfero.rb'
+      abort 'Version update not confirmed. Reverting changes and exiting...'
+    end
+  end
+
+  desc "uploads the packages to the repository"
+  task :upload_packages, :release_kind do |t, args|
+    release_kind = args[:release_kind] || 'stable'
+    sh "dput --unchecked #{release_kind} #{Dir['pkg/*.changes'].first}"
   end
   def ask(message)
@@ -179,8 +263,6 @@ EOF
     mkdir "#{target}/tmp"
     ln_s '../../../vendor/rails', "#{target}/vendor/rails"
     cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
-    # solr inclusion
-    Dir.chdir(target) { sh "rake solr:download" }
     sh "cd #{target} && dpkg-buildpackage -us -uc -b"
   end
@@ -100,7 +100,6 @@ cd mezuro
 git checkout mezuro-dev
 rvm use ruby-1.8.7-p302@mezuro
 cp config/database.yml.sqlite3 config/database.yml
-cp config/solr.yml.dist config/solr.yml
 cp plugins/mezuro/service.yml.example plugins/mezuro/service.yml
 cp plugins/mezuro/licenses.yml.example plugins/mezuro/licenses.yml
 mkdir tmp
@@ -116,5 +115,4 @@ ln -s mezuro-theme/ default
 cd ../../../
 #Prepare Mezuro for running functional and unit tests
-rake solr:download
-rake db:test:prepare
 \ No newline at end of file
+rake db:test:prepare
@@ -23,7 +23,6 @@ class MezuroPluginMetricConfigurationControllerTest &lt; ActionController::TestCase
     @configuration_content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name, :configuration_id => 42)
     @configuration_content.expects(:send_configuration_to_service).returns(nil)
     @configuration_content.expects(:validate_configuration_name).returns(true)
-    @configuration_content.stubs(:solr_save)
     @configuration_content.save
     @base_tool = BaseToolFixtures.base_tool
@@ -21,7 +21,6 @@ class MezuroPluginRangeControllerTest &lt; ActionController::TestCase
     @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name, :configuration_id => 42)
     @content.expects(:send_configuration_to_service).returns(nil)
     @content.expects(:validate_configuration_name).returns(true)
-    @content.stubs(:solr_save)
     @content.save
     @created_range = RangeFixtures.created_range
@@ -16,7 +16,6 @@ class MezuroPluginReadingControllerTest &lt; ActionController::TestCase
     @reading_hash = ReadingFixtures.hash
     @content = MezuroPlugin::ReadingGroupContent.new(:profile => @profile, :name => name)
     @content.expects(:send_reading_group_to_service).returns(nil)
-    @content.stubs(:solr_save)
     @content.save
   end
@@ -21,7 +21,6 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     @repository_hash = RepositoryFixtures.hash
     @content = MezuroPlugin::ProjectContent.new(:profile => @profile, :name => name)
     @content.expects(:send_project_to_service).returns(nil)
-    @content.stubs(:solr_save)
     @content.save
   end
@@ -48,7 +48,6 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
   should 'send configuration to service after saving' do
     @content.expects :send_configuration_to_service
-    @content.stubs(:solr_save)
     @content.run_callbacks :before_save
   end
	@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController		@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
33	def load_region_and_search	33	def load_region_and_search
34	@region = environment.regions.find(params[:id])	34	@region = environment.regions.find(params[:id])
35	if params[:search]	35	if params[:search]
36	- @search = @region.search_possible_validators(params[:search])	36	+ @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {\|item\| @region.validator_ids.include?(item.id) }
37	end	37	end
38	end	38	end
39		39
	@@ -154,4 +154,18 @@ class ApplicationController < ActionController::Base		@@ -154,4 +154,18 @@ class ApplicationController < ActionController::Base
154	end	154	end
155	end	155	end
156		156
		157	+ def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
		158	+ scope = scope.send(options[:filter]) if options[:filter]
		159	+
		160	+ @plugins.first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|
		161	+ fallback_find_by_contents(asset, scope, query, paginate_options, options)
		162	+ end
		163	+
		164	+ private
		165	+
		166	+ def fallback_find_by_contents(asset, scope, query, paginate_options, options)
		167	+ return {:results => scope.paginate(paginate_options)} if query.blank?
		168	+ {:results => scope.like_search(query).paginate(paginate_options)}
		169	+ end
		170	+
157	end	171	end
	@@ -270,7 +270,7 @@ class CmsController < MyProfileController		@@ -270,7 +270,7 @@ class CmsController < MyProfileController
270		270
271	def search	271	def search
272	query = params[:q]	272	query = params[:q]
273	- results = profile.files.published.find_by_contents(query)[:results]	273	+ results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
274	render :text => article_list_to_json(results), :content_type => 'application/json'	274	render :text => article_list_to_json(results), :content_type => 'application/json'
275	end	275	end
276		276
	@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController		@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController
11	if params[:where] == 'environment'	11	if params[:where] == 'environment'
12	redirect_to :controller => 'search', :query => @q	12	redirect_to :controller => 'search', :query => @q
13	else	13	else
14	- @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]	14	+ @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
15	end	15	end
16	end	16	end
17	end	17	end
	@@ -274,9 +274,9 @@ module ApplicationHelper		@@ -274,9 +274,9 @@ module ApplicationHelper
274		274
275	VIEW_EXTENSIONS = %w[.rhtml .html.erb]	275	VIEW_EXTENSIONS = %w[.rhtml .html.erb]
276		276
277	- def partial_for_class_in_view_path(klass, view_path, suffix = nil)	277	+ def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
278	return nil if klass.nil?	278	return nil if klass.nil?
279	- name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')	279	+ name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
280		280
281	search_name = String.new(name)	281	search_name = String.new(name)
282	if search_name.include?("/")	282	if search_name.include?("/")
	@@ -291,14 +291,14 @@ module ApplicationHelper		@@ -291,14 +291,14 @@ module ApplicationHelper
291	return name if File.exists?(File.join(path))	291	return name if File.exists?(File.join(path))
292	end	292	end
293		293
294	- partial_for_class_in_view_path(klass.superclass, view_path, suffix)	294	+ partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
295	end	295	end
296		296
297	- def partial_for_class(klass, suffix=nil)	297	+ def partial_for_class(klass, prefix=nil, suffix=nil)
298	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?	298	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
299	name = klass.name.underscore	299	name = klass.name.underscore
300	@controller.view_paths.each do \|view_path\|	300	@controller.view_paths.each do \|view_path\|
301	- partial = partial_for_class_in_view_path(klass, view_path, suffix)	301	+ partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
302	return partial if partial	302	return partial if partial
303	end	303	end
304		304
	@@ -2,12 +2,10 @@ module SearchHelper		@@ -2,12 +2,10 @@ module SearchHelper
2		2
3	MAP_SEARCH_LIMIT = 2000	3	MAP_SEARCH_LIMIT = 2000
4	LIST_SEARCH_LIMIT = 20	4	LIST_SEARCH_LIMIT = 20
5	- BLOCKS_SEARCH_LIMIT = 18	5	+ BLOCKS_SEARCH_LIMIT = 24
6	MULTIPLE_SEARCH_LIMIT = 8	6	MULTIPLE_SEARCH_LIMIT = 8
7	- DistFilt = 200
8	- DistBoost = 50
9		7
10	- Searches = ActiveSupport::OrderedHash[	8	+ SEARCHES = ActiveSupport::OrderedHash[
11	:articles, _('Contents'),	9	:articles, _('Contents'),
12	:enterprises, _('Enterprises'),	10	:enterprises, _('Enterprises'),
13	:people, _('People'),	11	:people, _('People'),
	@@ -16,46 +14,31 @@ module SearchHelper		@@ -16,46 +14,31 @@ module SearchHelper
16	:events, _('Events'),	14	:events, _('Events'),
17	]	15	]
18		16
19	- SortOptions = {
20	- :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
21	- :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
22	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
23	- :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
24	- :solr_opts => {:sort => "geodist() asc",
25	- :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
26	- ],
27	- :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
28	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
29	- ],
30	- :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
31	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
32	- :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
33	- ],
34	- :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
35	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
36	- ],
37	- :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
38	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
39	- ],
40	- :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
41	- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
42	- ],	17	+ FILTER_TRANSLATION = {
		18	+ 'more_popular' => _('More popular'),
		19	+ 'more_active' => _('More active'),
		20	+ 'more_recent' => _('More recent'),
		21	+ 'more_comments' => _('More comments')
43	}	22	}
44		23
45	# FIXME remove it after search_controler refactored	24	# FIXME remove it after search_controler refactored
46	include EventsHelper	25	include EventsHelper
47		26
48	- def multiple_search?
49	- ['index', 'category_index'].include?(params[:action]) or @results.size > 1	27	+ def multiple_search?(searches=nil)
		28	+ ['index', 'category_index'].include?(params[:action]) \|\| (searches && searches.size > 1)
50	end	29	end
51		30
52	- def map_search?
53	- !@empty_query and !multiple_search? and params[:display] == 'map'	31	+ def map_search?(searches=nil)
		32	+ !multiple_search?(searches) && params[:display] == 'map'
		33	+ end
		34	+
		35	+ def asset_class(asset)
		36	+ asset.to_s.singularize.camelize.constantize
54	end	37	end
55		38
56	def search_page_title(title, category = nil)	39	def search_page_title(title, category = nil)
57	title = "<h1>" + title	40	title = "<h1>" + title
58	- title += '<small>' + category.name + '</small>' if category	41	+ title += ' - <small>' + category.name + '</small>' if category
59	title + "</h1>"	42	title + "</h1>"
60	end	43	end
61		44
	@@ -66,8 +49,12 @@ module SearchHelper		@@ -66,8 +49,12 @@ module SearchHelper
66	:align => 'center', :class => 'search-category-context') if category	49	:align => 'center', :class => 'search-category-context') if category
67	end	50	end
68		51
69	- def display_results(map_capable = false)
70	- if map_capable and map_search?	52	+ def display?(asset, mode)
		53	+ defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
		54	+ end
		55	+
		56	+ def display_results(searches=nil, asset=nil)
		57	+ if display?(asset, :map) && map_search?(searches)
71	partial = 'google_maps'	58	partial = 'google_maps'
72	klass = 'map'	59	klass = 'map'
73	else	60	else
	@@ -78,10 +65,13 @@ module SearchHelper		@@ -78,10 +65,13 @@ module SearchHelper
78	content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")	65	content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
79	end	66	end
80		67
81	- def display_map_list_button
82	- button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
83	- params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
84	- :class => "map-toggle-button" )	68	+ def display_filter(asset, display)
		69	+ asset = :articles if asset == :tag
		70	+ if display?(asset, display)
		71	+ display
		72	+ else
		73	+ asset_class(asset).default_search_display
		74	+ end
85	end	75	end
86		76
87	def city_with_state(city)	77	def city_with_state(city)
	@@ -97,120 +87,50 @@ module SearchHelper		@@ -97,120 +87,50 @@ module SearchHelper
97	end	87	end
98	end	88	end
99		89
100	- def facets_menu(asset, _facets)
101	- @asset_class = asset_class(asset)
102	- @facets = _facets
103	- render(:partial => 'facets_menu')
104	- end
105	-
106	- def facets_unselect_menu(asset)
107	- @asset_class = asset_class(asset)
108	- render(:partial => 'facets_unselect_menu')
109	- end
110	-
111	- def facet_javascript(input_id, facet, array)
112	- array = [] if array.nil?
113	- hintText = _('Type in an option')
114	- text_field_tag('facet['+input_id+']', '', :id => input_id) +
115	- javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
116	- {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
117	- #{jquery_token_input_messages_json(hintText)}});")
118	- end
119	-
120	- def facet_link_html(facet, params, value, label, count)
121	- params = params ? params.dup : {}
122	- has_extra = label.kind_of?(Array)
123	- link_label = has_extra ? label[0] : label
124	- id = facet[:solr_field].to_s
125	- params[:facet] \|\|= {}
126	- params[:facet][id] \|\|= {}
127	- params[:page] = {} if params[:page]
128	-
129	- selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
130	-
131	- if count > 0
132	- url = params.merge(:facet => params[:facet].merge(
133	- id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a \| [value] )
134	- ))
135	- else
136	- # preserve others filters and change this filter
137	- url = params.merge(:facet => params[:facet].merge(
138	- id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
139	- ))	90	+ def display_selector(asset, display, float = 'right')
		91	+ display = nil if display.blank?
		92	+ display \|\|= asset_class(asset).default_search_display
		93	+ if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {\|option\| option}.count > 1
		94	+ compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
		95	+ map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
		96	+ full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
		97	+ content_tag('div',
		98	+ content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' \| ').html_safe,
		99	+ :class => 'search-customize-options'
		100	+ )
140	end	101	end
141	-
142	- content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
143	- content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
144	- (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
145	- :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
146	end	102	end
147		103
148	- def facet_selecteds_html_for(environment, klass, params)
149	- def name_with_extra(klass, facet, value)
150	- name = klass.facet_result_name(facet, value)
151	- name = name[0] + name[1] if name.kind_of?(Array)
152	- name
153	- end
154	-
155	- ret = []
156	- params = params.dup
157	- params[:facet].each do \|id, value\|
158	- facet = klass.facet_by_id(id.to_sym)
159	- next unless facet
160	- if value.kind_of?(Hash)
161	- label_hash = facet[:label].call(environment)
162	- value.each do \|label_id, value\|
163	- facet[:label_id] = label_id
164	- facet[:label] = label_hash[label_id]
165	- value.to_a.each do \|value\|
166	- ret << [facet[:label], name_with_extra(klass, facet, value),
167	- params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ \|v\| v == value })))]
168	- end
169	- end
170	- else
171	- ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
172	- params.merge(:facet => params[:facet].reject{ \|k,v\| k == id })]
173	- end	104	+ def filter_selector(asset, filter, float = 'right')
		105	+ klass = asset_class(asset)
		106	+ if klass::SEARCH_FILTERS.count > 1
		107	+ options = options_for_select(klass::SEARCH_FILTERS.map {\|f\| [FILTER_TRANSLATION[f], f]}, filter)
		108	+ url_params = url_for(params.merge(:filter => 'FILTER'))
		109	+ onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
		110	+ select_field = select_tag(:filter, options, :onchange => onchange)
		111	+ content_tag('div',
		112	+ content_tag('strong', _('Filter')) + ': ' + select_field,
		113	+ :class => "search-customize-options"
		114	+ )
174	end	115	end
175	-
176	- ret.map do \|label, name, url\|
177	- content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
178	- content_tag('span', name, :class => 'facet-selected-name') +
179	- link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
180	- end.join
181	- end
182	-
183	- def order_by(asset)
184	- options = SortOptions[asset].map do \|name, options\|
185	- next if options[:if] and ! instance_eval(&options[:if])
186	- [_(options[:label]), name.to_s]
187	- end.compact
188	-
189	- content_tag('div', _('Sort results by ') +
190	- select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] \|\| 'none'),
191	- {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
192	- :class => "search-ordering")
193	- end
194	-
195	- def label_total_found(asset, total_found)
196	- labels = {
197	- :products => _("%s products offers found"),
198	- :articles => _("%s articles found"),
199	- :events => _("%s events found"),
200	- :people => _("%s people found"),
201	- :enterprises => _("%s enterprises found"),
202	- :communities => _("%s communities found"),
203	- }
204	- content_tag('span', labels[asset] % total_found,
205	- :class => "total-pages-found") if labels[asset]
206	- end
207	-
208	- def asset_class(asset)
209	- asset.to_s.singularize.camelize.constantize
210	end	116	end
211		117
212	- def asset_table(asset)
213	- asset_class(asset).table_name	118	+ def filter_title(asset, filter)
		119	+ {
		120	+ 'articles_more_recent' => _('More recent contents from network'),
		121	+ 'articles_more_popular' => _('More viewed contents from network'),
		122	+ 'articles_more_comments' => _('Most commented contents from network'),
		123	+ 'people_more_recent' => _('More recent people from network'),
		124	+ 'people_more_active' => _('More active people from network'),
		125	+ 'people_more_popular' => _('More popular people from network'),
		126	+ 'communities_more_recent' => _('More recent communities from network'),
		127	+ 'communities_more_active' => _('More active communities from network'),
		128	+ 'communities_more_popular' => _('More popular communities from network'),
		129	+ 'enterprises_more_recent' => _('More recent enterprises from network'),
		130	+ 'enterprises_more_active' => _('More active enterprises from network'),
		131	+ 'enterprises_more_popular' => _('More popular enterprises from network'),
		132	+ 'products_more_recent' => _('Highlights'),
		133	+ }[asset.to_s + '_' + filter].to_s
214	end	134	end
215		135
216	end	136	end
	@@ -2,6 +2,26 @@ require 'hpricot'		@@ -2,6 +2,26 @@ require 'hpricot'
2		2
3	class Article < ActiveRecord::Base	3	class Article < ActiveRecord::Base
4		4
		5	+ SEARCHABLE_FIELDS = {
		6	+ :name => 10,
		7	+ :abstract => 3,
		8	+ :body => 2,
		9	+ :slug => 1,
		10	+ :filename => 1,
		11	+ }
		12	+
		13	+ SEARCH_FILTERS = %w[
		14	+ more_recent
		15	+ more_popular
		16	+ more_comments
		17	+ ]
		18	+
		19	+ SEARCH_DISPLAYS = %w[full]
		20	+
		21	+ def self.default_search_display
		22	+ 'full'
		23	+ end
		24	+
5	#FIXME This is necessary because html is being generated on the model...	25	#FIXME This is necessary because html is being generated on the model...
6	include ActionView::Helpers::TagHelper	26	include ActionView::Helpers::TagHelper
7		27
	@@ -147,7 +167,6 @@ class Article < ActiveRecord::Base		@@ -147,7 +167,6 @@ class Article < ActiveRecord::Base
147	else	167	else
148	ArticleCategorization.add_category_to_article(c, self)	168	ArticleCategorization.add_category_to_article(c, self)
149	self.categories(reload)	169	self.categories(reload)
150	- self.solr_save
151	end	170	end
152	end	171	end
153		172
	@@ -165,7 +184,6 @@ class Article < ActiveRecord::Base		@@ -165,7 +184,6 @@ class Article < ActiveRecord::Base
165	ArticleCategorization.add_category_to_article(item, self)	184	ArticleCategorization.add_category_to_article(item, self)
166	end	185	end
167	self.categories(true)	186	self.categories(true)
168	- self.solr_save
169	pending_categorizations.clear	187	pending_categorizations.clear
170	end	188	end
171		189
	@@ -201,20 +219,12 @@ class Article < ActiveRecord::Base		@@ -201,20 +219,12 @@ class Article < ActiveRecord::Base
201	named_scope :public,	219	named_scope :public,
202	:conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]	220	:conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
203		221
204	- named_scope :more_recent,
205	- :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
206	- ((articles.type != ?) OR articles.type is NULL)",
207	- true, true, true, true, 'RssFeed'
208	- ],
209	- :order => 'articles.published_at desc, articles.id desc'
210	-
211	# retrives the most commented articles, sorted by the comment count (largest	222	# retrives the most commented articles, sorted by the comment count (largest
212	# first)	223	# first)
213	def self.most_commented(limit)	224	def self.most_commented(limit)
214	paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)	225	paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
215	end	226	end
216		227
217	- named_scope :more_popular, :order => 'hits DESC'
218	named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]	228	named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
219		229
220	def self.recent(limit = nil, extra_conditions = {}, pagination = true)	230	def self.recent(limit = nil, extra_conditions = {}, pagination = true)
	@@ -426,8 +436,8 @@ class Article < ActiveRecord::Base		@@ -426,8 +436,8 @@ class Article < ActiveRecord::Base
426	named_scope :images, :conditions => { :is_image => true }	436	named_scope :images, :conditions => { :is_image => true }
427	named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]	437	named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
428		438
		439	+ named_scope :more_popular, :order => 'hits DESC'
429	named_scope :more_comments, :order => "comments_count DESC"	440	named_scope :more_comments, :order => "comments_count DESC"
430	- named_scope :more_views, :order => "hits DESC"
431	named_scope :more_recent, :order => "created_at DESC"	441	named_scope :more_recent, :order => "created_at DESC"
432		442
433	def self.display_filter(user, profile)	443	def self.display_filter(user, profile)
	@@ -479,10 +489,6 @@ class Article < ActiveRecord::Base		@@ -479,10 +489,6 @@ class Article < ActiveRecord::Base
479	allow_post_content?(user) \|\| user && allow_members_to_edit && user.is_member_of?(profile)	489	allow_post_content?(user) \|\| user && allow_members_to_edit && user.is_member_of?(profile)
480	end	490	end
481		491
482	- def comments_updated
483	- solr_save
484	- end
485	-
486	def accept_category?(cat)	492	def accept_category?(cat)
487	!cat.is_a?(ProductCategory)	493	!cat.is_a?(ProductCategory)
488	end	494	end
	@@ -620,7 +626,7 @@ class Article < ActiveRecord::Base		@@ -620,7 +626,7 @@ class Article < ActiveRecord::Base
620		626
621	end	627	end
622		628
623	- def more_views_label	629	+ def more_popular_label
624	amount = self.hits	630	amount = self.hits
625	{	631	{
626	0 => _('no views'),	632	0 => _('no views'),
	@@ -648,98 +654,7 @@ class Article < ActiveRecord::Base		@@ -648,98 +654,7 @@ class Article < ActiveRecord::Base
648	img.nil? ? '' : img.attributes['src']	654	img.nil? ? '' : img.attributes['src']
649	end	655	end
650		656
651	- private
652	-
653	- # FIXME: workaround for development env.
654	- # Subclasses aren't (re)loaded, and acts_as_solr
655	- # depends on subclasses method to search
656	- # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
657	- UploadedFile
658	- TextArticle
659	- TinyMceArticle
660	- TextileArticle
661	- Folder
662	- EnterpriseHomepage
663	- Gallery
664	- Blog
665	- Forum
666	- Event
667	-
668	- def self.f_type_proc(klass)
669	- klass.constantize.type_name
670	- end
671	-
672	- def self.f_profile_type_proc(klass)
673	- klass.constantize.type_name
674	- end
675	-
676	- def f_type
677	- #join common types
678	- case self.class.name
679	- when 'TinyMceArticle', 'TextileArticle'
680	- TextArticle.name
681	- else
682	- self.class.name
683	- end
684	- end
685	-
686	- def f_profile_type
687	- self.profile.class.name
688	- end
689	-
690	- def f_published_at
691	- self.published_at
692	- end
693	-
694	- def f_category
695	- self.categories.collect(&:name)
696	- end
697	-
698	delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true	657	delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
699	- def name_sortable # give a different name for solr
700	- name
701	- end
702	-
703	- def public
704	- self.public?
705	- end
706	-
707	- def category_filter
708	- categories_including_virtual_ids
709	- end
710	-
711	- public
712	-
713	- acts_as_faceted :fields => {
714	- :f_type => {:label => _('Type'), :proc => proc{\|klass\| f_type_proc(klass)}},
715	- :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
716	- '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
717	- :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
718	- :f_profile_type => {:label => _('Profile'), :proc => proc{\|klass\| f_profile_type_proc(klass)}},
719	- :f_category => {:label => _('Categories')},
720	- }, :category_query => proc { \|c\| "category_filter:\"#{c.id}\"" },
721	- :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
722	-
723	- acts_as_searchable :fields => facets_fields_for_solr + [
724	- # searched fields
725	- {:name => {:type => :text, :boost => 2.0}},
726	- {:slug => :text}, {:body => :text},
727	- {:abstract => :text}, {:filename => :text},
728	- # filtered fields
729	- {:public => :boolean}, {:environment_id => :integer},
730	- {:profile_id => :integer}, :language,
731	- {:category_filter => :integer},
732	- # ordered/query-boosted fields
733	- {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
734	- :updated_at, :created_at,
735	- ], :include => [
736	- {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
737	- {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
738	- {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
739	- ], :facets => facets_option_for_solr,
740	- :boost => proc { \|a\| 10 if a.profile && a.profile.enabled },
741	- :if => proc{ \|a\| ! ['RssFeed'].include?(a.class.name) }
742	- handle_asynchronously :solr_save
743		658
744	private	659	private
745		660
1	class Category < ActiveRecord::Base	1	class Category < ActiveRecord::Base
2		2
		3	+ SEARCHABLE_FIELDS = {
		4	+ :name => 10,
		5	+ :acronym => 5,
		6	+ :abbreviation => 5,
		7	+ :slug => 1,
		8	+ }
		9	+
3	validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n	10	validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
4	validates_presence_of :name, :environment_id	11	validates_presence_of :name, :environment_id
5	validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n	12	validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
	@@ -100,23 +107,4 @@ class Category < ActiveRecord::Base		@@ -100,23 +107,4 @@ class Category < ActiveRecord::Base
100	self.children.find(:all, :conditions => {:display_in_menu => true}).empty?	107	self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
101	end	108	end
102		109
103	- private
104	- def name_sortable # give a different name for solr
105	- name
106	- end
107	- public
108	-
109	- acts_as_searchable :fields => [
110	- # searched fields
111	- {:name => {:type => :text, :boost => 2.0}},
112	- {:path => :text}, {:slug => :text},
113	- {:abbreviation => :text}, {:acronym => :text},
114	- # filtered fields
115	- :parent_id,
116	- # ordered/query-boosted fields
117	- {:name_sortable => :string},
118	- ]
119	- after_save_reindex [:articles, :profiles], :with => :delayed_job
120	- handle_asynchronously :solr_save
121	-
122	end	110	end
	@@ -268,8 +268,6 @@ class Environment < ActiveRecord::Base		@@ -268,8 +268,6 @@ class Environment < ActiveRecord::Base
268		268
269	settings_items :search_hints, :type => Hash, :default => {}	269	settings_items :search_hints, :type => Hash, :default => {}
270		270
271	- settings_items :top_level_category_as_facet_ids, :type => Array, :default => []
272	-
273	def news_amount_by_folder=(amount)	271	def news_amount_by_folder=(amount)
274	settings[:news_amount_by_folder] = amount.to_i	272	settings[:news_amount_by_folder] = amount.to_i
275	end	273	end
1	class License < ActiveRecord::Base	1	class License < ActiveRecord::Base
		2	+
		3	+ SEARCHABLE_FIELDS = {
		4	+ :name => 10,
		5	+ :url => 5,
		6	+ }
		7	+
2	belongs_to :environment	8	belongs_to :environment
3	has_many :content, :class_name => 'Article', :foreign_key => 'license_id'	9	has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
4		10