Ticket #1462: bugzilla2trac.py.5.diff

.py

@@ -26 +26 @@
 #
 # If you run this script on a version not listed here and it is successful,
 # please report it to the Trac mailing list so we can update the list.
-BZ_VERSION = '2.16.5'
+BZ_VERSION = '2.18.1'
 
 # MySQL connection parameters for the Bugzilla database.  These can also
 # be specified on the command line.
@@ -138 +138 @@
         self._db = self.env.get_db_cnx()
         self._db.autocommit = False
         self.loginNameCache = {}
+        self.componentNameCache = {}
+        self.productNameCache = {}
         self.fieldNameCache = {}
 
     def db(self):
@@ -283 +285 @@
 
         return self.loginNameCache[userid]
 
+    def getComponentName(self, cursor, componentid):
+        if componentid not in self.componentNameCache:
+            cursor.execute("SELECT * FROM components WHERE id = %s" % componentid)
+            componentName = cursor.fetchall()
+
+            if componentName:
+                componentName = componentName[0]['name']
+            else:
+                print 'warning: unknown bugzilla component id %d, recording as unknown' % componentid
+                componentName = 'unknown'
+
+            self.componentNameCache[componentid] = componentName
+
+        return self.componentNameCache[componentid]
+
+    def getProductName(self, cursor, productid):
+        if productid not in self.productNameCache:
+            cursor.execute("SELECT * FROM products WHERE id = %s" % productid)
+            productName = cursor.fetchall()
+
+            if productName:
+                productName = productName[0]['name']
+            else:
+                print 'warning: unknown bugzilla product id %d, recording as unknown' % productid
+                productName = 'unknown'
+
+            self.productNameCache[productid] = productName
+
+        return self.productNameCache[productid]
+
     def getFieldName(self, cursor, fieldid):
         if fieldid not in self.fieldNameCache:
             cursor.execute("SELECT * FROM fielddefs WHERE fieldid = %s" % fieldid)
@@ -350 +382 @@
 
     print
     print "2. import components..."
-    sql = "SELECT value, initialowner AS owner FROM components"
+    sql = "SELECT name, initialowner AS owner FROM components"
     if PRODUCTS:
        sql += " WHERE %s" % productFilter('program', PRODUCTS)
     mysql_cur.execute(sql)
     components = mysql_cur.fetchall()
     for component in components:
                component['owner'] = trac.getLoginName(mysql_cur, component['owner'])
-    trac.setComponentList(components, 'value')
+    trac.setComponentList(components, 'name')
 
     print
     print "3. import priorities..."
@@ -401 +433 @@
         ticket['id'] = bugid
         ticket['time'] = bug['creation_ts']
         ticket['changetime'] = bug['delta_ts']
-        ticket['component'] = bug['component']
+        ticket['component'] = trac.getComponentName(mysql_cur, bug['component_id'])
         ticket['severity'] = bug['bug_severity']
         ticket['priority'] = bug['priority']
 
@@ -574 +606 @@
             if kw not in keywords:
                 keywords.append(kw)
 
-        if bug['product'] in PRODUCT_KEYWORDS:
-            kw = PRODUCT_KEYWORDS[bug['product']]
+        productName = trac.getProductName(mysql_cur, bug['product_id'])
+        if productName in PRODUCT_KEYWORDS:
+            kw = PRODUCT_KEYWORDS[productName]
             # may have already been added during activity import
             if kw not in keywords:
                 keywords.append(kw)