Changeset 533

Timestamp:

07/28/11 14:24:30 (12 years ago)

Author:

bas

Message:

ticket_update_by_subject enhancement, closes #253

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (2 diffs)

trunk/ChangeLog

@@ -29 +29 @@
   * Fixed an error in the logging environment for Windows oses, closes #251
     Reported by:  kofal002 add umn dot edu
+    Fixed by: Bas van der Vlies
+
+  * Ticket_update_by_subject enhancement. If multiple tickets are found 
+    with the same subject then we try a author/reporter match. If fails
+    use most recent ticket entry, closes #253
+    Reported by: kofal002 att umn dot edu
     Fixed by: Bas van der Vlies
 

trunk/debian/changelog

@@ +1 @@
+email2trac (2.1.4-1) stable; urgency=low
+
+  *  see Changelog
+
+ -- Bas van der Vlies <bas@sara.nl>  Thu, 28 Jul 2011 14:22:45 +0200
+
 email2trac (2.1.3-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -1024 +1024 @@
         self.logger.debug('function ticket_update_by_subject')
 
-        matched_id = None
+        found_id = None
         if self.parameters.ticket_update and self.parameters.ticket_update_by_subject:
                 
@@ -1052 +1052 @@
                     self.logger.debug('Looking for summary matching: "%s"' % summary)
 
-                    sql = """SELECT id FROM ticket
+                    sql = """SELECT id, reporter FROM ticket
                             WHERE changetime >= %s AND summary LIKE %s
                             ORDER BY changetime DESC"""
+
                     cursor.execute(sql, [lookback, summary.strip()])
 
                     for row in cursor:
-                        (matched_id,) = row
-
-                        self.logger.debug('Found matching ticket id: %d' % matched_id)
-
-                        break
-
-                    if matched_id:
-                        matched_id = '#%d' % matched_id
-                        return (matched_id, orig_subject)
-                    
-                    subject = orig_subject
-
-        return (matched_id, subject)
+
+                        (matched_id, sql_reporter) = row
+
+                        ## Save first entry. 
+                        #
+                        if not found_id:
+                            found_id = matched_id
+                           
+                        ## If subject and reporter are the same. The we certainly have found the right ticket
+                        #
+                        if sql_reporter == self.author:
+                            self.logger.debug('Found matching reporter: %s with ticket id: %d' %(sql_reporter, matched_id))
+                            found_id = matched_id
+                            break
+
+                    if found_id:
+                        self.logger.debug('Found matching ticket id: %d' % found_id)
+                        found_id = '#%d' % found_id
+                        return (found_id, orig_subject)
+                   
+                    # obesolete !??
+                    #subject = orig_subject
+
+        return (found_id, subject)