# HG changeset patch
# User Xavier Manach <xavier.manach@xcg-consulting.fr>
# Date 1317378225 -7200
# Fri Sep 30 12:23:45 2011 +0200
# Node ID a710c8eba49843e7f33285605c5758f8546d484a
# Parent 9a89817b87e2a68e2e5a8f90d267d9b5454d3e92
Remove debugs.
diff --git a/marketing_campaign_tracker.py b/marketing_campaign_tracker.py
--- a/marketing_campaign_tracker.py
+++ b/marketing_campaign_tracker.py
@@ -28,26 +28,10 @@
"""
_inherit = 'email.template'
- print 'hooked_email_template'
-
- def add_tracker_in_mail(self, values, context=None):
-
- print values.body_text
- print values.body_html
-
- # CHANGE FROM ORIGINAL METHOD
-
- print values.body_text
- print values.body_html
-
- return values
-
-
def send_mail(self, cr, uid, template_id, res_id, context=None):
"""Generates a new mail message for the given template and record, and schedule it for delivery through the ``mail`` module's scheduler.
:param int template_id: id of the template to render :param int res_id: id of the record to render the template with (model is taken from the template) """
- print 'DEBUG send_mail XCG'
mail_message = self.pool.get('mail.message')
ir_attachment = self.pool.get('ir.attachment')
template = self.browse(cr, uid, template_id, context)
@@ -56,31 +40,20 @@
# here we need to use tracker so let's do it
tracker_base = context.get('tracker_base')
if values['body_text']:
- print values['body_text']
values['body_text'], tracks = insert_tracker_in_text(
values['body_text'],
tracker_base,
context['activity_id'])
- print values['body_text']
if values['body_html']:
- print values['body_html']
values['body_html'], tracks = insert_tracker_in_html(
values['body_html'],
tracker_base,
context['activity_id'])
- print values['body_html']
- print 'DEBUG 1'
trackitem = self.pool.get('marketing_campaign_tracker.trackitem')
- print 'DEBUG 2'
- print trackitem
- print dir(trackitem)
for trackvalues in tracks:
- print trackvalues
# create a trackitem for each URL that is replaced
- print 'DEBUG 3'
trackitem.create(cr, uid, trackvalues, context=None)
- print 'DEBUG 4'
#values = self.add_tracker(cr, uid, template_id, res_id, context=context)
attachments = values.pop('attachments') or {}
diff --git a/replace.py b/replace.py
--- a/replace.py
+++ b/replace.py
@@ -29,7 +29,6 @@
html_imgsrc_re = re.compile(r'img src="([-a-zA-Z0-9_/.?&=:]+)"')
def insert_tracker_in_text(text, tracker_base, activity_id):
- print 'ooooo'
tracks = []
def repl(match_obj):
@@ -46,7 +45,6 @@
return simple_text_url_re.sub(repl, text), tracks
def insert_tracker_in_html(html, tracker_base, activity_id):
- print 'ooooohtml'
tracks = []