Changeset 17

Timestamp:

07/06/06 11:59:18 (3 years ago)

Author:

ploum

Message:

#13 : launchpadweb searches incorrect results
#28 : results are not scrollable

Added BeautifulSoup? 3.0.3 from http://www.crummy.com/software/BeautifulSoup/
Thanks a lot to authors and contributors to BeautifulSoup?

Files:

• BeautifulSoup.py (added)
• conseil.py (modified) (4 diffs)
• launchpad_test.py (added)
• protocol_launchpadweb.py (modified) (5 diffs)

conseil.py

@@ -15 +15 @@
         sys.exit(1)
 
-from protocol_dummy import protocol
+from protocol_launchpadweb import protocol
 from bug import bug
 
@@ -80 +80 @@
                 # essai temporaire
                 # normalement ici on lit le fichier de préférences
-                listing.insert_before(None, ["UNCONFIRMED", 2, "blablabla"])
-                listing.insert_before(None, ["Evo's bugs", 3, "evolution bugs"])
+                listing.insert_before(None, ["3 results", 2, "nautilus evolution crash"])
+                listing.insert_before(None, ["many results", 2, "microsoft has majority"])
+                listing.insert_before(None, ["Evo's bugs", 3, "evolution refresh folder"])
                 listing.insert_before(None, ["Bug #42", 1, "42"])
                 renderer = gtk.CellRendererText()
@@ -184 +185 @@
                 tree.set_rules_hint(1)
                 tree.set_model(store)
-                self.insertTab(tree,title)
+                tab = gtk.ScrolledWindow()
+                tab.show()
+                tab.add(tree)
+                self.insertTab(tab,title)
                 
 
@@ -222 +226 @@
                         page = self.bugs_tabs.page_num(data)
                         self.bugs_tabs.remove_page(page)
-
                 tab = widget
                 #this is ugly ! I don't want to use glade for this

protocol_launchpadweb.py

@@ -5 +5 @@
 import urllib
 from bug import bug
+from BeautifulSoup import BeautifulSoup
 # You have to change this if you have another storage
 from auth_dummy import user
@@ -23 +24 @@
         def Name(self):
                 return "launchpadweb"
+
+        # send the name of the bts this protocol will talk too.
+        # this is intended for future multi-protocol support
+        # and will enable bookmarks sharing between differents protocols
+        # that speaks to the same bts
+        def bts(self):
+                return "launchpad"
 
 ################BUG RETRIEVING IN THE BTS #################################
@@ -80 +88 @@
         
         # content is an array of bug numbers
-        def __populateResult(self, results, content):
-                #boucle pour n'afficher que 10 bugs (c'est une démo)
-                j = 0
-                for i in content :
-                        #besoin de prog défensive ici FIXME
-                        nbr=int(i)
-                        print "processing bug %s" %j
-                        bug = self.retrieveBug(nbr)
-                        results.insert_before(None, [nbr, bug.getPackage(), bug.getTitle(), bug.getImportance(), bug.getStatus()])
-                        j += 1
-                        if j > 10 : break
+        def __populateResult(self, results, content, typeofsearch, arg_package):
+                table = content.body.findAll('tbody')[1].findAll('tr')
+                for tr in table :
+                        row = tr.findAll('td')
+                        nbr = int(row[1].contents[0])
+                        title = row[2].a.contents[0]
+                        if typeofsearch == 2 :
+                                package = row[3].contents[0]
+                                importance = row[4].contents[0]
+                                status = row[5].contents[0]
+                        elif typeofsearch == 3 :
+                                package = arg_package
+                                importance = row[3].contents[0]
+                                status = row[4].contents[0]
+                        else :
+                                package = ''
+                                importance = ''
+                                status = ''
+                        results.insert_before(None, [nbr, package, title, importance, status ])
                 return results
+
 
         # genericSearch on a given string search_str.
@@ -101 +118 @@
                 #inserting dummies bugs
                 plus = search_str.replace(" ","+")
-                zeurl="https://launchpad.net/distros/ubuntu/+bugs-text?field.searchtext=%s" %plus
+                zeurl="https://launchpad.net/distros/ubuntu/+bugs?field.searchtext=%s" %plus
                 f= urllib.urlopen(zeurl)
-                content=f.readlines()
-                return self.__populateResult(results, content)
+                content=BeautifulSoup(f)
+                return self.__populateResult(results, content, 2, None)
         
                 
@@ -121 +138 @@
                 if search_str != None :
                         plus = search_str.replace(" ","+")
-                        zeurl="https://launchpad.net/distros/ubuntu/+source/%s/+bugs-text?field.searchtext=%s" %(package,plus)
+                        zeurl="https://launchpad.net/distros/ubuntu/+source/%s/+bugs?field.searchtext=%s" %(package,plus)
                 else :
-                        zeurl="https://launchpad.net/distros/ubuntu/+source/%s/+bugs-text" %package
+                        zeurl="https://launchpad.net/distros/ubuntu/+source/%s/+bugs" %package
                 f= urllib.urlopen(zeurl)
-                content=f.readlines()
-                return self.__populateResult(results, content)
+                content=BeautifulSoup(f)
+                return self.__populateResult(results, content, 3, package)
                 
                 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%