Some enhancements on solr

Removed whitespaces Recovered schema.rb without plugins fields Included info about solr support of multitenancy on solr.yml.dist

Some enhancements on solr
Removed whitespaces Recovered schema.rb without plugins fields Included info about solr support of multitenancy on solr.yml.dist
Daniela Feitosa
1 parent 2468db59
Showing 37 changed files with 116 additions and 158 deletions Show diff stats
INSTALL
app/controllers/application.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/lightbox_helper.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/domain.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/product.rb
app/models/profile.rb
app/views/layouts/_javascript.rhtml
app/views/layouts/application-ng.rhtml
app/views/manage_products/_display_image.rhtml
app/views/maps/_google_map.js.erb
app/views/maps/edit_location.rhtml
app/views/search/_blog.rhtml
app/views/search/_display_results.rhtml
app/views/search/_image.rhtml
@@ -13,7 +13,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-ruby-data 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 openjdk-6-jre 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.
 require 'application_controller'
-
@@ -46,7 +46,7 @@ class SearchController &lt; PublicController
   def products
     public_filters = ['public:true', 'enabled:true']
     if !@empty_query
-      full_text_search public_filters 
+      full_text_search public_filters
     else
       @one_page = true
       @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
@@ -183,7 +183,7 @@ class SearchController &lt; PublicController
     @asset = params[:action].to_sym
     @order ||= [@asset]
     @results ||= {}
-    @filter = filter 
+    @filter = filter
     @filter_title = filter_description(@asset, @filter)
     @query = params[:query] || ''
@@ -198,7 +198,7 @@ class SearchController &lt; PublicController
       @category = environment.categories.find_by_path(path)
       if @category.nil?
         render_not_found(path)
-      else 
+      else
         @category_id = @category.id
       end
     end
@@ -220,12 +220,12 @@ class SearchController &lt; PublicController
   def filter_description(asset, filter)
     {
       'articles_more_recent' => _('More recent contents from network'),
-      'articles_more_popular' => _('More read contents from network'),
+      'articles_more_popular' => _('More viewed 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_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]
@@ -1088,7 +1088,7 @@ module ApplicationHelper
   def search_contents_menu
     links = [
       {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
-      {s_('contents|More Read') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}
+      {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}
     ]
     if logged_in?
       links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
@@ -22,7 +22,10 @@ module LightboxHelper
   def lightbox_options(options, lightbox_type = 'lbOn')
     the_class = lightbox_type
     the_class << " #{options[:class]}" if options.has_key?(:class)
-    options.merge(:class => the_class)
+    options.merge(
+      :class => the_class,
+      :onclick => 'alert("%s"); return false' % _('Please, try again when the page loading completes.')
+    )
   end
   def lightbox?
@@ -77,9 +77,9 @@ module SearchHelper
   end
   def city_with_state(city)
-    if city and city.kind_of?(City) 
+    if city and city.kind_of?(City)
       s = city.parent
-      if s and s.kind_of?(State) and s.acronym 
+      if s and s.kind_of?(State) and s.acronym
         city.name + ', ' + s.acronym
       else
         city.name
@@ -140,7 +140,7 @@ module SearchHelper
   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 = name[0] + name[1] if name.kind_of?(Array)
       name
     end
@@ -165,7 +165,7 @@ module SearchHelper
     end
     ret.map do |label, name, url|
-      content_tag('div', content_tag('span', label, :class => 'facet-selected-label') + 
+      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
@@ -199,7 +199,7 @@ module SearchHelper
   def asset_class(asset)
     asset.to_s.singularize.camelize.constantize
   end
-  
+
   def asset_table(asset)
     asset_class(asset).table_name
   end
@@ -661,8 +661,8 @@ class Article &lt; ActiveRecord::Base
   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_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')},
@@ -8,7 +8,7 @@ class Domain &lt; ActiveRecord::Base
   # validations
   #############
-  # <tt>name</tt> must be sequences of alphanumeric characters (a to z, 
+  # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
   validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
@@ -162,9 +162,9 @@ class Enterprise &lt; Organization
     end
   end
-  def control_panel_settings_button                                                                                                                                                             
-    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}                                                                                                          
-  end 
+  def control_panel_settings_button
+    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+  end
   settings_items :enable_contact_us, :type => :boolean, :default => true
@@ -365,11 +365,11 @@ class Environment &lt; ActiveRecord::Base
   end
   def terminology
-    #if self.settings[:terminology]
-      #self.settings[:terminology].constantize.instance
-    #else
+    if self.settings[:terminology]
+      self.settings[:terminology].constantize.instance
+    else
       Noosfero.terminology
-    #end
+    end
   end
   def terminology=(value)
@@ -219,7 +219,7 @@ class Product &lt; ActiveRecord::Base
   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 
+    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
       [c.name, ', ' + s.acronym]
     else
       c.name
@@ -239,7 +239,7 @@ class Profile &lt; ActiveRecord::Base
       self.categories(true)
       self.solr_save
     end
-		self.categories(reload)
+	 self.categories(reload)
   end
   def category_ids=(ids)
@@ -544,7 +544,7 @@ private :generate_url, :url_options
     other.top_level_articles.each do |a|
       copy_article_tree a
     end
-		self.articles.reload
+    self.articles.reload
   end
   def copy_article_tree(article, parent=nil)
@@ -864,7 +864,7 @@ private :generate_url, :url_options
   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 
+    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
       [c.name, ', ' + s.acronym]
     else
       c.name
@@ -872,7 +872,7 @@ private :generate_url, :url_options
   end
   def self.f_enabled_proc(enabled)
-    enabled = enabled == "true" ? true : false 
+    enabled = enabled == "true" ? true : false
     enabled ? _('Enabled') : _('Not enabled')
   end
   def f_enabled
@@ -920,8 +920,8 @@ private :generate_url, :url_options
   after_save_reindex [:articles], :with => :delayed_job
   handle_asynchronously :solr_save
-  def control_panel_settings_button                                                                                                                                                             
-    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}                                                                                                                         
+  def control_panel_settings_button
+    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
   end 
   def followed_by?(person)
-<%= javascript_include_tag :defaults, 'jquery-latest.js', 
+<%= javascript_include_tag :defaults, 'jquery-latest.js',
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 
+'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
 'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
 <% language = FastGettext.locale %>
@@ -62,7 +62,7 @@
               </div>
           </span>
           <form action="/search" class="search_form" method="get" class="clean">
-            <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" /> 
+            <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
             <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
             <%= javascript_tag 'jQuery("#user form input").hint();' %>
           </form>
@@ -3,7 +3,7 @@
 </div>
 <% if @product.image %>
-  <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename, 
+  <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
     :class => 'zoomify-image' %>
 <% end %>
 <%= add_zoom_to_images %>
@@ -16,7 +16,7 @@ function getAddress(latlng) {
 function codeAddress() {
   $('location-fields').addClassName("loading");
-  
+
   var country_option = $('profile_data_country').value;
   var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;
@@ -78,7 +78,7 @@ function getAddressData() {
 }
 function showAddress(results, status) {
-  
+
   if (status == google.maps.GeocoderStatus.OK) {
     map.setCenter(results[0].geometry.location);
     updateFields(results[0]);
@@ -113,10 +113,10 @@ function updateFields(place) {
   var state = "";
   var country_code = "";
   var i = 0;
-  
+
   for( i =0 ; i < components_len; i ++)
   {
-  
+
       if (components[i].types[0] == 'country')
         country_code = components[i].short_name;
       else if (components[i].types[0] == 'administrative_area_level_1')
@@ -132,7 +132,7 @@ function updateFields(place) {
       else if (components[i].types[0] == 'postal_code')
         zip_code = components[i].short_name;
   }
-  
+
   $('profile_data_country').value = country_code;
   $('profile_data_state').value = state;
   $('profile_data_address').value = address;
@@ -26,9 +26,8 @@
   <%= f.hidden_field :lat %>
   <%= f.hidden_field :lng %>
- 
+
 <% end %>
 <%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
 <%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
-
@@ -15,7 +15,7 @@
         <%= _('None') if r.empty? %>
       </td>
     </tr>
-    
+
     <%= render :partial => 'article_common', :object => blog %>
   </table>
   <%= render :partial => 'article_last_change', :object => blog %>
@@ -31,7 +31,7 @@
       <% end %>
     </div>
   <% end %>
-  
+
   <div style="clear:both"></div>
   <%= add_zoom_to_images %>
 <div class="search-image-container">
-  
+
   <% if image.is_a? UploadedFile and image.filename %>
     <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>
     <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
@@ -38,9 +38,9 @@
   <% elsif image.is_a? Product %>
     <% if image.image %>
     <div class="zoomable-image">
-      <%= link_to '', product_path(image), :class => "search-image-pic", 
+      <%= 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, 
+      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
           :class => 'zoomify-image' %>
     </div>
     <% else %>
@@ -20,7 +20,7 @@
         <% 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 %>" 
+            <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>
@@ -29,7 +29,7 @@
           <% if product.price_described? %>
             <% title = (product.inputs + product.price_details).map{ |i|
               '<div class="search-product-input-dots-to-price">' +
-                '<div class="search-product-input-name">' + i.product_category.name + '</div>' + 
+                '<div class="search-product-input-name">' + i.product_category.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" %>
@@ -26,14 +26,12 @@
       <div class="search-enterprise-categorization">
         <% profile.top_level_categorization.each do |parent, children| %>
-          <% if parent.name != "Territórios" %>
-            <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 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>
 <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"> 
+    <div class="search-results-header-information">
       <% if @results[@asset].total_entries > 0 %>
         <%= label_total_found(@asset, @results[@asset].total_entries) %>
         <% if params[:display] != 'map' %>
@@ -9,7 +9,7 @@
       <% end %>
     </div>
-    <div class="search-results-header-facets-order-by"> 
+    <div class="search-results-header-facets-order-by">
       <%= facets_unselect_menu(@asset) %>
       <%= order_by(@asset) if params[:display] != 'map' %>
     </div>
@@ -2,7 +2,7 @@
   <% form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) },
                  :method => 'get', :class => 'search_form' ) do %>
-  
+
     <%= hidden_field_tag :display, params[:display] %>
     <% params_uri = CGI::unescape(request.request_uri) %>
@@ -14,18 +14,18 @@
         <% end %>
       <% end %>
     <% end %>
-  
+
     <div class="search-field">
       <span class="formfield">
         <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50 %>
         <%= javascript_tag "jQuery('#search-input').attr('title', \"#{hint}\").hint()" if defined?(hint) %>
       </span>
-  
+
       <%= submit_button(:search, _('Search')) %>
     </div>
   <% end %>
-  
+
   <% if @empty_query %>
     <% hint = environment.search_hints[@asset] %>
     <% if hint and !hint.blank? %>
@@ -8,7 +8,7 @@
   <%= render :partial => 'search_form', :locals => { :hint => '' } %>
   <%= category_context(@category, params) %>
   <%= display_results %>
-    
+
   <div id="category-childs">
     <% if @category %>
       <h2> <%= _('Sub-categories')  %> </h2>
@@ -18,11 +18,3 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
-
-config.gem 'cucumber',    :lib => false,        :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
-config.gem 'webrat',      :lib => false,        :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-config.gem 'rspec',       :lib => 'spec',        :version => '1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails', :lib => 'spec/rails',        :version => '1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
-config.gem 'Selenium',    :lib => 'selenium',      :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
-config.gem 'selenium-client',    :lib => 'selenium/client',      :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
-config.gem 'database_cleaner', :lib => 'database_cleaner'
 # Config file for the acts_as_solr plugin.
 #
-# If you change the host or port number here, make sure you update 
+# 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
-  
+# This file must follow a structure in order to achieve multitenancy
+# support. In this example, we will configure solr to support 3
+# different schemas: env1, env2 and env3.
+#
+# Each "hosted" environment must have an entry like this:
+#
+# production: &PRODUCTION
+#  url: http://127.0.0.1:8983/solr
+#  jvm_options: -server -Xmx192M -Xms64M
+#  timeout: 0
+#
+# env1_production:
+#  <<: *PRODUCTION
+#
+# env2_production:
+#  <<: *PRODUCTION
+#
+# env3_production:
+#  <<: *PRODUCTION
+
 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
 class RemoveBrokenReferencesToCategory < ActiveRecord::Migration
   def self.up
     execute <<-SQL
-      delete from articles_categories where category_id not in (select id from categories); 
+      delete from articles_categories where category_id not in (select id from categories);
     SQL
     execute <<-SQL
       delete from categories_profiles where category_id not in (select id from categories);
@@ -161,36 +161,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
   add_index "boxes", ["owner_id", "owner_type"], :name => "index_boxes_on_owner_type_and_owner_id"
-  create_table "bsc_plugin_contracts", :force => true do |t|
-    t.string   "client_name"
-    t.integer  "client_type"
-    t.integer  "business_type"
-    t.string   "state"
-    t.string   "city"
-    t.integer  "status",              :default => 0
-    t.integer  "number_of_producers", :default => 0
-    t.datetime "supply_start"
-    t.datetime "supply_end"
-    t.text     "annotations"
-    t.integer  "bsc_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "bsc_plugin_contracts_enterprises", :id => false, :force => true do |t|
-    t.integer "contract_id"
-    t.integer "enterprise_id"
-  end
-
-  create_table "bsc_plugin_sales", :force => true do |t|
-    t.integer  "product_id",  :null => false
-    t.integer  "contract_id", :null => false
-    t.integer  "quantity",    :null => false
-    t.decimal  "price"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "categories", :force => true do |t|
     t.string  "name"
     t.string  "slug"
@@ -284,7 +254,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "reports_lower_bound",          :default => 0,         :null => false
-    t.text     "send_email_plugin_allow_to"
   end
   create_table "external_feeds", :force => true do |t|
@@ -308,10 +277,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer "enterprise_id"
   end
-  create_table "foo_plugin_bars", :force => true do |t|
-    t.string "name"
-  end
-
   create_table "friendships", :force => true do |t|
     t.integer  "person_id"
     t.integer  "friend_id"
@@ -432,7 +397,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.string   "type"
     t.string   "identifier"
     t.integer  "environment_id"
-    t.boolean  "active",                                     :default => true
+    t.boolean  "active",                             :default => true
     t.string   "address"
     t.string   "contact_phone"
     t.integer  "home_page_id"
@@ -443,26 +408,19 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.float    "lat"
     t.float    "lng"
     t.integer  "geocode_precision"
-    t.boolean  "enabled",                                    :default => true
-    t.string   "nickname",                     :limit => 16
+    t.boolean  "enabled",                            :default => true
+    t.string   "nickname",             :limit => 16
     t.text     "custom_header"
     t.text     "custom_footer"
     t.string   "theme"
-    t.boolean  "public_profile",                             :default => true
+    t.boolean  "public_profile",                     :default => true
     t.date     "birth_date"
     t.integer  "preferred_domain_id"
     t.datetime "updated_at"
-    t.boolean  "visible",                                    :default => true
+    t.boolean  "visible",                            :default => true
     t.integer  "image_id"
-    t.boolean  "validated",                                  :default => true
+    t.boolean  "validated",                          :default => true
     t.string   "cnpj"
-    t.boolean  "shopping_cart",                              :default => true
-    t.boolean  "shopping_cart_delivery",                     :default => false
-    t.decimal  "shopping_cart_delivery_price",               :default => 0.0
-    t.string   "usp_id"
-    t.integer  "bar_id"
-    t.integer  "bsc_id"
-    t.string   "company_name"
     t.string   "national_region_code"
   end
@@ -526,15 +484,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.datetime "updated_at"
   end
-  create_table "shopping_cart_plugin_purchase_orders", :force => true do |t|
-    t.integer  "customer_id"
-    t.integer  "seller_id"
-    t.text     "data"
-    t.integer  "status"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
@@ -562,7 +511,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
-    t.integer  "bsc_id"
   end
   create_table "thumbnails", :force => true do |t|
 # Config file for the acts_as_solr plugin.
 #
-# If you change the host or port number here, make sure you update 
+# 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
@@ -25,8 +25,7 @@ Given /^I reject community &quot;(.+)&quot;$/ do |community|
 end
 Then /^I should see "([^\"]*)"'s creation date$/ do |community|
-  com = Community.find_by_name community  
+  com = Community.find_by_name community
   text = "Created at: #{show_date(com.created_at)}"
   response.should contain(text)
 end
-
@@ -12,9 +12,9 @@ config/mongrel_cluster.yml
 config/solr.yml
 config/plugins
 config/thin.yml
-/index
-/locale
-/log
+index
+locale
+log
 public/articles
 public/image_uploads
 public/thumbnails
@@ -29,9 +29,9 @@ db/production.db
 db/test.db
 doc/noosfero/*.xhtml
 doc/noosfero/*/*.xhtml
-/tags
-/pkg
-/solr
+tags
+pkg
+solr
 *~
 *.swp
 debian/*.log
@@ -47,7 +47,7 @@ module ActsAsSearchable
           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 : []
@@ -719,14 +719,14 @@ Array.min = function(array) {
 (function ($) {
 $.fn.hint = function (blurClass) {
-  if (!blurClass) { 
+  if (!blurClass) {
     blurClass = 'blur';
   }
-    
+
   return this.each(function () {
     // get jQuery version of 'this'
     var $input = $(this),
-    
+
     // capture the rest of the variable to allow for reuse
       title = $input.attr('title'),
       $form = $(this.form),
@@ -739,14 +739,14 @@ $.fn.hint = function (blurClass) {
     }
     // only apply logic if the element has the attribute
-    if (title) { 
+    if (title) {
       // on blur, set value to title attr if text is blank
       $input.blur(function () {
         if (this.value === '') {
           $input.val(title).addClass(blurClass);
         }
       }).focus(remove).blur(); // now change all inputs to title
-      
+
       // clear the pre-defined text when form is submitted
       $form.submit(remove);
       $win.unload(remove); // handles Firefox's autocomplete
@@ -8,7 +8,7 @@ function mapOpenBalloon(marker, html) {
   infoWindow.setContent(html);
   infoWindow.open(map, marker);
 }
-   
+
 function mapPutMarker(lat, lng, title, icon, url_or_function) {
   var point_str = lat + ":" + lng;
@@ -18,7 +18,7 @@ function mapPutMarker(lat, lng, title, icon, url_or_function) {
   } else {
     mapPoints[point_str] = true;
   }
-     
+
   var point = new google.maps.LatLng(lat, lng);
   var options = { map: map, title: title, icon: icon, position: point };
   var marker = new google.maps.Marker(options);
 # Config file for the acts_as_solr plugin.
 #
-# If you change the host or port number here, make sure you update 
+# 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
	@@ -13,7 +13,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or		@@ -13,7 +13,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or
13	Debian-based systems, all of these packages are available through the Debian	13	Debian-based systems, all of these packages are available through the Debian
14	archive. You can install them with the following command:	14	archive. You can install them with the following command:
15		15
16	- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby-data 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	16	+ # 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
17		17
18	On other systems, they may or may not be available through your regular package	18	On other systems, they may or may not be available through your regular package
19	management system. Below are the links to their homepages.	19	management system. Below are the links to their homepages.
1	require 'application_controller'	1	require 'application_controller'
2	-
	@@ -1088,7 +1088,7 @@ module ApplicationHelper		@@ -1088,7 +1088,7 @@ module ApplicationHelper
1088	def search_contents_menu	1088	def search_contents_menu
1089	links = [	1089	links = [
1090	{s_('contents\|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},	1090	{s_('contents\|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
1091	- {s_('contents\|More Read') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}	1091	+ {s_('contents\|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}
1092	]	1092	]
1093	if logged_in?	1093	if logged_in?
1094	links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))	1094	links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
	@@ -77,9 +77,9 @@ module SearchHelper		@@ -77,9 +77,9 @@ module SearchHelper
77	end	77	end
78		78
79	def city_with_state(city)	79	def city_with_state(city)
80	- if city and city.kind_of?(City)	80	+ if city and city.kind_of?(City)
81	s = city.parent	81	s = city.parent
82	- if s and s.kind_of?(State) and s.acronym	82	+ if s and s.kind_of?(State) and s.acronym
83	city.name + ', ' + s.acronym	83	city.name + ', ' + s.acronym
84	else	84	else
85	city.name	85	city.name
	@@ -140,7 +140,7 @@ module SearchHelper		@@ -140,7 +140,7 @@ module SearchHelper
140	def facet_selecteds_html_for(environment, klass, params)	140	def facet_selecteds_html_for(environment, klass, params)
141	def name_with_extra(klass, facet, value)	141	def name_with_extra(klass, facet, value)
142	name = klass.facet_result_name(facet, value)	142	name = klass.facet_result_name(facet, value)
143	- name = name[0] + name[1] if name.kind_of?(Array)	143	+ name = name[0] + name[1] if name.kind_of?(Array)
144	name	144	name
145	end	145	end
146		146
	@@ -165,7 +165,7 @@ module SearchHelper		@@ -165,7 +165,7 @@ module SearchHelper
165	end	165	end
166		166
167	ret.map do \|label, name, url\|	167	ret.map do \|label, name, url\|
168	- content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +	168	+ content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
169	content_tag('span', name, :class => 'facet-selected-name') +	169	content_tag('span', name, :class => 'facet-selected-name') +
170	link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')	170	link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
171	end.join	171	end.join
	@@ -199,7 +199,7 @@ module SearchHelper		@@ -199,7 +199,7 @@ module SearchHelper
199	def asset_class(asset)	199	def asset_class(asset)
200	asset.to_s.singularize.camelize.constantize	200	asset.to_s.singularize.camelize.constantize
201	end	201	end
202	-	202	+
203	def asset_table(asset)	203	def asset_table(asset)
204	asset_class(asset).table_name	204	asset_class(asset).table_name
205	end	205	end
	@@ -8,7 +8,7 @@ class Domain < ActiveRecord::Base		@@ -8,7 +8,7 @@ class Domain < ActiveRecord::Base
8	# validations	8	# validations
9	#############	9	#############
10		10
11	- # <tt>name</tt> must be sequences of alphanumeric characters (a to z,	11	+ # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
12	# 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.	12	# 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
13	validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n	13	validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
14		14
	@@ -219,7 +219,7 @@ class Product < ActiveRecord::Base		@@ -219,7 +219,7 @@ class Product < ActiveRecord::Base
219	def self.f_region_proc(id)	219	def self.f_region_proc(id)
220	c = Region.find(id)	220	c = Region.find(id)
221	s = c.parent	221	s = c.parent
222	- if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym	222	+ if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
223	[c.name, ', ' + s.acronym]	223	[c.name, ', ' + s.acronym]
224	else	224	else
225	c.name	225	c.name
1	-<%= javascript_include_tag :defaults, 'jquery-latest.js',	1	+<%= javascript_include_tag :defaults, 'jquery-latest.js',
2	'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',	2	'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
3	'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',	3	'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
4	-'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',	4	+'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
5	'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>	5	'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
6		6
7	<% language = FastGettext.locale %>	7	<% language = FastGettext.locale %>
	@@ -62,7 +62,7 @@		@@ -62,7 +62,7 @@
62	</div>	62	</div>
63	</span>	63	</span>
64	<form action="/search" class="search_form" method="get" class="clean">	64	<form action="/search" class="search_form" method="get" class="clean">
65	- <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />	65	+ <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
66	<div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>	66	<div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
67	<%= javascript_tag 'jQuery("#user form input").hint();' %>	67	<%= javascript_tag 'jQuery("#user form input").hint();' %>
68	</form>	68	</form>
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	</div>	3	</div>
4		4
5	<% if @product.image %>	5	<% if @product.image %>
6	- <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,	6	+ <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
7	:class => 'zoomify-image' %>	7	:class => 'zoomify-image' %>
8	<% end %>	8	<% end %>
9	<%= add_zoom_to_images %>	9	<%= add_zoom_to_images %>
	@@ -16,7 +16,7 @@ function getAddress(latlng) {		@@ -16,7 +16,7 @@ function getAddress(latlng) {
16		16
17	function codeAddress() {	17	function codeAddress() {
18	$('location-fields').addClassName("loading");	18	$('location-fields').addClassName("loading");
19	-	19	+
20	var country_option = $('profile_data_country').value;	20	var country_option = $('profile_data_country').value;
21	var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;	21	var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;
22		22
	@@ -78,7 +78,7 @@ function getAddressData() {		@@ -78,7 +78,7 @@ function getAddressData() {
78	}	78	}
79		79
80	function showAddress(results, status) {	80	function showAddress(results, status) {
81	-	81	+
82	if (status == google.maps.GeocoderStatus.OK) {	82	if (status == google.maps.GeocoderStatus.OK) {
83	map.setCenter(results[0].geometry.location);	83	map.setCenter(results[0].geometry.location);
84	updateFields(results[0]);	84	updateFields(results[0]);
	@@ -113,10 +113,10 @@ function updateFields(place) {		@@ -113,10 +113,10 @@ function updateFields(place) {
113	var state = "";	113	var state = "";
114	var country_code = "";	114	var country_code = "";
115	var i = 0;	115	var i = 0;
116	-	116	+
117	for( i =0 ; i < components_len; i ++)	117	for( i =0 ; i < components_len; i ++)
118	{	118	{
119	-	119	+
120	if (components[i].types[0] == 'country')	120	if (components[i].types[0] == 'country')
121	country_code = components[i].short_name;	121	country_code = components[i].short_name;
122	else if (components[i].types[0] == 'administrative_area_level_1')	122	else if (components[i].types[0] == 'administrative_area_level_1')
	@@ -132,7 +132,7 @@ function updateFields(place) {		@@ -132,7 +132,7 @@ function updateFields(place) {
132	else if (components[i].types[0] == 'postal_code')	132	else if (components[i].types[0] == 'postal_code')
133	zip_code = components[i].short_name;	133	zip_code = components[i].short_name;
134	}	134	}
135	-	135	+
136	$('profile_data_country').value = country_code;	136	$('profile_data_country').value = country_code;
137	$('profile_data_state').value = state;	137	$('profile_data_state').value = state;
138	$('profile_data_address').value = address;	138	$('profile_data_address').value = address;