muck-raker 0.1.27 → 0.1.28

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.1.28

data/app/controllers/muck/entries_controller.rb

@@ -75,15 +75,15 @@ class Muck::EntriesController < ApplicationController
   protected
 
   def _search operator = :or
-    @page = (params[:page] || 0).to_i
+    @page = (params[:page] || 1).to_i
     @per_page = (params[:per_page] || 10).to_i
-    @offset = @page*@per_page
+    @offset = (@page-1)*@per_page
     if !@search.nil?
       @term_list = URI.escape(@search) 
       results = Entry.search(@search, @grain_size, I18n.locale.to_s, @per_page, @offset, operator)
       @hit_count = results.total
       @results = results.results
-      @paginated_results = @results.paginate(:page => @page+1, :per_page => @per_page, :total_entries => @hit_count)
+      @paginated_results = @results.paginate(:page => @page, :per_page => @per_page, :total_entries => @hit_count)
       log_query(current_user.nil? ? request.remote_addr : current_user.id, Language.locale_id, @tag_filter.nil? ? 'search' : 'browse', @search, @grain_size, @hit_count)
     end
   end

data/config/muck_raker_routes.rb

@@ -1,5 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-
+                                      �
   # admin
   map.namespace :admin do |a|
     a.resources :feeds, :controller => 'muck/feeds'
@@ -29,16 +29,4 @@ ActionController::Routing::Routes.draw do |map|
 
   # redirect (and hit tracking)
 
-  # search
-  map.connect 'search/relations.:format/*terms', :controller => 'muck/search', :action => 'relations'
-  map.connect 'search/relations/*terms', :controller => 'muck/search', :action => 'relations'
-  map.connect 'search/source_uri.:format', :controller => 'muck/search', :action => 'source_uri'
-  map.connect 'search/source_uri', :controller => 'muck/search', :action => 'source_uri'
-  map.connect 'search/destination_uri.:format', :controller => 'muck/search', :action => 'destination_uri'
-  map.connect 'search/destination_uri', :controller => 'muck/search', :action => 'destination_uri'
-  map.connect 'search/uris.:format', :controller => 'muck/search', :action => 'uris'
-  map.connect 'search/uris', :controller => 'muck/search', :action => 'uris'
-  map.connect 'search/results.:format', :controller => 'muck/search', :action => 'results'
-  map.connect 'search/results', :controller => 'muck/search', :action => 'results'
-
 end

data/config/solr/cores/de/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/en/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/es/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/fr/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/ja/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/nl/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,18 +265,25 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
-  <!-- Update request handler.  
-  
+  <!-- Update request handler.
+
        Note: Since solr1.1 requestHandlers requires a valid content type header if posted in 
        the body. For example, curl now requires: -H 'Content-type:text/xml; charset=utf-8'
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/ru/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/config/solr/cores/zh/conf/solrconfig.xml

@@ -242,7 +242,7 @@
     -->
   <requestDispatcher handleSelect="true" >
     <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
       
@@ -265,6 +265,13 @@
      </lst>
   </requestHandler>
 
+  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
+    <lst name="defaults">
+      <str name="mlt.fl">text</str>
+      <int name="mlt.mindf">1</int>
+    </lst>
+  </requestHandler>
+
   <!-- Note how you can register the same handler multiple times with
        different names (and different init parameters)
     -->
@@ -275,8 +282,8 @@
        The response format differs from solr1.1 formatting and returns a standard error code.
        
        To enable solr1.1 behavior, remove the /update handler or change its path
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
     -->
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered

data/locales/en.yml

@@ -138,6 +138,7 @@ en:
         facebook_notifications: "Facebook Notifications"
         facebook_shares: "Facebook Shared Links"
         facebook_notes: "Facebook Notes"
+        add_edit_feeds: "Add/Edit Feeds"
         comment_entries_count:
           one: "1 Comment"
           other: "{{count}} Comments"

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.27"
+  s.version = "0.1.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-12}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "app/controllers/muck/feeds_controller.rb",
      "app/controllers/muck/identity_feeds_controller.rb",
      "app/controllers/muck/recommendations_controller.rb",
-     "app/controllers/muck/search_controller.rb",
      "app/controllers/muck/visits_controller.rb",
      "app/helpers/muck_raker_feeds_helper.rb",
      "app/helpers/muck_raker_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -06:00
+date: 2009-09-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,7 +122,6 @@ files:
 - app/controllers/muck/feeds_controller.rb
 - app/controllers/muck/identity_feeds_controller.rb
 - app/controllers/muck/recommendations_controller.rb
-- app/controllers/muck/search_controller.rb
 - app/controllers/muck/visits_controller.rb
 - app/helpers/muck_raker_feeds_helper.rb
 - app/helpers/muck_raker_helper.rb

data/app/controllers/muck/search_controller.rb

@@ -1,84 +0,0 @@
-class Muck::SearchController < ApplicationController
-
-  unloadable
-  
-  def initialize
-    @limit = 50
-    @no_index = true
-  end
-
-  #########################################################
-  # Show search page if there is nothing specified to search for
-  # or if there are searchable params search for them
-  def index
-    if request.post?
-      if params[:form_terms].nil? or params[:form_terms].empty?
-        flash[:message] = 'Please enter something to search for.'
-      else
-        redirect_to '/search/results?terms=' + URI.escape(params[:form_terms])
-      end
-    end
-  end
-
-  #########################################################
-  # search all fields for the given terms
-  def results
-    @page_title = "Search"
-    @language = params[:locale] || 'en'
-    @languages = Language.find(:all, :order => "name")
-    @limit = params[:limit] ? params[:limit].to_i : 10
-    @limit = 25 if @limit > 25
-    @offset = params[:offset] ? params[:offset].to_i : 0
-    @term_list = ''
-    if !params[:terms].nil? && !params[:terms].empty?
-      @term_list += URI.escape(params[:terms])
-    end
-
-    if request.post?
-      if params[:form_terms].nil? or params[:form_terms].empty?
-        flash[:message] = 'Please enter something to search for.'
-        redirect_to '/'
-      else
-        redirect_to '/search/results?terms=' + URI.escape(params[:form_terms]) + (@language.nil? ? "" : "&locale=" + @language)
-      end
-    else
-      @current_uri = '/search/results'
-      if params[:terms]
-        @url_terms = '?terms=' + @term_list
-        results = Entry.search(URI.unescape(params[:terms]), @language, @limit, @offset)
-        @results = results.records
-        @hit_count = results.total
-        @terms = URI.unescape(params[:terms])
-      else
-        @url_terms = ''
-        @results = []
-        @terms = '' 
-      end
-
-      respond_to do |format|
-        format.html 
-        format.xml  { render :layout=>false }
-        format.rss  { render :layout=>false }
-        format.pjs { 
-          @json_results = ActiveSupport::JSON.encode(@results)
-          render(:template => 'search/results.pjs.erb', :layout => false)  
-        }
-        format.atom { render :layout=>false }
-        format.rdf  { render :layout=>false }
-      end
-    end
-  end
-
-  #########################################################
-  # all the results are rendered the same
-  def render_search
-    respond_to do |format|
-      format.html { render :template => '/search/index' }
-      format.xml  { render :xml => flash.to_xml }
-      format.rss  { render :xml => flash.to_xml }
-      format.atom  { render :xml => flash.to_xml }
-      format.rdf  { render :xml => flash.to_xml }
-    end
-  end
-
-end