Skip to content

Commit

Permalink
if the session is already valid, then determine the source
Browse files Browse the repository at this point in the history
  • Loading branch information
Doug Youch committed Dec 2, 2010
1 parent 7acd9cd commit 67af2aa
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions app/models/domain_log_session.rb
Expand Up @@ -44,7 +44,7 @@ def self.start_session(user, session, request, site_node=nil, ignore=true)
tracking = Tracking.new(request)
session[:user_referrer] = tracking.referrer_domain if tracking.referrer_domain
session[:domain_log_visitor] ||= {}
ses = self.session(session[:domain_log_visitor][:id],request.session_options[:id], user, request.remote_ip, true, tracking, site_node, ignore)
ses = self.session(session[:domain_log_visitor][:id],request.session_options[:id], user, request.remote_ip, true, tracking, site_node, ignore, session)
session[:domain_log_session] = { :id => ses.id, :end_user_id => user.id }
end
end
Expand All @@ -56,7 +56,7 @@ def session_content
end

# validates_uniqueness_of :session_id
def self.session(visitor_id,session_id,user,ip_address,save_entry=true,tracking=nil,site_node=nil,ignore=true)
def self.session(visitor_id,session_id,user,ip_address,save_entry=true,tracking=nil,site_node=nil,ignore=true,full_session=nil)
user = user.id if user.is_a?(EndUser)
returning (self.find_by_session_id(session_id) || self.new(:session_id => session_id, :ip_address => ip_address)) do |ses|

Expand All @@ -79,6 +79,12 @@ def self.session(visitor_id,session_id,user,ip_address,save_entry=true,tracking=
:affiliate_data => tracking.affiliate_data} if tracking && ses.id.nil?

ses.attributes = {:end_user_id => user}

unless ignore
source = DomainLogSource.get_source ses, full_session if full_session
ses.domain_log_source_id = source[:id] if source
end

ses.save if save_entry
end

Expand Down

0 comments on commit 67af2aa

Please sign in to comment.