Changeset 32 for conseil.py

Timestamp:

07/09/06 14:53:14 (2 years ago)

Author:

ploum

Message:

#11 Bookmarks are not stored

Files:

• conseil.py (modified) (8 diffs)

conseil.py

@@ -121 +121 @@
                 if method == 1:
                         # besoin de programmation défensive ici FIXME
+                        dic["method"] = 1
                         bug_nbr = clicked.get_bug()
-                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr))
+                        dic["bug"] = bug_nbr
+                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr), dic)
                 elif method == 2:
                         dic["method"] = 2
                         searchString = clicked.get_search()
                         dic["search"] = searchString
-                        widget.__searchDisplay(widget.bts.genericSearch(searchString),2,dic)
+                        widget.__searchDisplay(widget.bts.genericSearch(searchString),dic)
                 elif method == 3:
                         dic["method"] = 3
@@ -134 +136 @@
                         search = clicked.get_search()
                         dic["search"] = search
-                        widget.__searchDisplay(widget.bts.packageSearch(product,search),3,dic)
+                        widget.__searchDisplay(widget.bts.packageSearch(product,search),dic)
 
         #when the "add bookmark button is clicked
@@ -141 +143 @@
                 if tab != None :
                         #tab_descr function is part of page
-                        array = tab_descr(tab)
-                        self.bookmarks.add(array[0],int(array[1]),array[2])
+                        descr = tab_descr(tab)
+                        self.bookmarks.add(descr)
         
         #main search button pressed
         def simpleSearch_clicked(self, widget):
                 searchString = self.wTree.get_widget("simple_search_entry").get_text()
+                dic = makedict()
                 # Have we a single bug number ?
                 if self.__isint(searchString) :
-                        self.__bugDisplay(self.bts.retrieveBug(int(searchString)))
+                        dic["method"] = 1
+                        dic["bug"] = searchString
+                        self.__bugDisplay(self.bts.retrieveBug(int(searchString)),dic)
                 # no, we have a search.
                 else :
                         array = string.split(searchString,' ',1)
-                        dic = makedict()
                         if self.bts.packageExist(array[0]) :
                                 dic["method"]= 3
@@ -159 +163 @@
                                 #this is only to avoid an error when searching on a lonely package
                                 if len(array) < 2 :
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),3,dic)
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),dic)
                                 else :
                                         dic["search"] = array[1]        
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),3,dic)
+                                        self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),dic)
                         else :
                                 dic["method"]= 2
                                 dic["search"] = searchString
-                                self.__searchDisplay(self.bts.genericSearch(searchString),2,dic)
+                                self.__searchDisplay(self.bts.genericSearch(searchString),dic)
 
         #We did a simple search
-        def __searchDisplay(self, store,search_type,args):
+        def __searchDisplay(self, store,args):
                 #First, we ask for the result as it can takes some times                        
                 tree=self.__treeInit__()
@@ -179 +183 @@
                 tab.show()
                 tab.add(tree)
-                zepage = page(tab, search_type, args)
+                zepage = page(tab, args)
                 self.insertTab(zepage)          
 
@@ -191 +195 @@
         # This function takes a bug Object and then display it nicely
         # (it will be nice one day, I swear...)
-        def __bugDisplay(self, zebug) :
+        def __bugDisplay(self, zebug, descr) :
                 bugnbr=str(zebug.getNbr())
                 bugtemplate = "bug_template.glade"
@@ -236 +240 @@
                 #We take the vbox to insert it
                 main_widget = bugwidget.get_widget("bug_main")
-                zepage = page(main_widget, 1, bugnbr)
+                zepage = page(main_widget, descr)
                 self.insertTab(zepage)
 
@@ -262 +266 @@
 #Those dict are passed as argument to __searchDisplay
 def makedict() :
-        return dict([["method",None],["search",None],["product",None]])
+        return dict([["method",None],["search",None],["product",None],["bug",None]])