muck-raker 0.1.38 → 0.1.39

data/VERSION

@@ -1 +1 @@
-0.1.38
+0.1.39

data/app/controllers/muck/recommendations_controller.rb

@@ -22,7 +22,7 @@ class Muck::RecommendationsController < ApplicationController
       params[:more_link] = true
     end
 
-    Entry.track_time_on_page(session, @uri)
+#    Entry.track_time_on_page(session, @uri)
     @entry = Entry.recommender_entry(@uri)
 #    I18n.locale = @entry.language[0..1] if !@entry.nil?
 
@@ -40,11 +40,11 @@ class Muck::RecommendationsController < ApplicationController
         end
       end
       format.xml  { 
-        render(:template => @entry.id.nil? && real_time == true ? '/recommendations/index_real_time.xml.builder' : '/recommendations/index.xml.builder', :layout => false)
+        render(:template => @entry.id.nil? && @real_time == true ? '/recommendations/index_real_time.xml.builder' : '/recommendations/index.xml.builder', :layout => false)
       }
       format.pjs {
         @host = "http://#{URI.parse(@uri).host}"
-        render(:template => @entry.id.nil? && real_time == true ? 'recommendations/index_real_time.pjs.erb' : 'recommendations/index.pjs.erb', :layout => false)
+        render(:template => @entry.id.nil? && @real_time == true ? 'recommendations/index_real_time.pjs.erb' : 'recommendations/index.pjs.erb', :layout => false)
       }
       format.rss {
         render(:template => 'recommendations/index.rss.builder', :layout => false)  

data/app/controllers/muck/visits_controller.rb

@@ -7,7 +7,7 @@ class Muck::VisitsController < ApplicationController
   def show
     @entry = Entry.find(params[:id])
     @page_title = @entry.title
-    @resource_uri = @entry.resource_uri + (@entry.resource_uri.include?('?') ? "&" : "?") + "show_recs=true";
+    @resource_uri = @entry.resource_uri
     @share = Share.new(:title => @entry.title, :uri => @resource_uri, :entry_id => @entry.id) if GlobalConfig.enable_raker_shares
 
     if GlobalConfig.enable_raker_comments

data/app/models/entry.rb

@@ -177,13 +177,13 @@ class Entry < ActiveRecord::Base
   end
   
   def ranked_recommendations(limit = 5, order = "mixed", details = false, omit_feeds = nil)
-    if self.id.nil?
-      return Entry.real_time_recommendations(self.permalink, details, :core => 'en', :limit => limit) 
-    else
+#    if self.id.nil?
+#      return Entry.real_time_recommendations(self.permalink, details, :core => 'en', :limit => limit)
+#    else
       return relevant_recommendations(limit, "clicks DESC, relevance", details, omit_feeds) if order == "clicks" 
       return relevant_recommendations(limit, "relevance", details, omit_feeds) if (order == "relevance" || details == true)
       return relevant_recommendations_filtered(limit, details, omit_feeds) if omit_feeds != nil 
-    end
+#    end
 
     recs = []
     if self.popular != nil && !self.popular.empty?

data/lib/muck_raker/tasks.rb

@@ -225,6 +225,25 @@ module MuckRaker
             end
           end
 
+          desc "Redo recommendations only"
+          task :redo_recommendations => :environment do
+            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
+            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
+            puts "RAILS_ENV=" + ENV['RAILS_ENV']
+            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
+              jars = Dir['*.jar'].join(separator)
+              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
+              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
+              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
+              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
+              classpath = "-classpath #{jars}#{separator}. "
+              javaclass = "edu.usu.cosl.recommender.Recommender "
+              cmd = "java " + options + classpath + javaclass
+              puts ("Executing: " + cmd) if ENV['DEBUG']
+              exec cmd
+            end
+          end
+
           desc "Redo everything (re-index, redo autogenerated subjects, rebuild tag clouds re-recommend)"
           task :rebuild => :environment do
             require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")

data/muck-raker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.38"
+  s.version = "0.1.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball