r6873 - bigboard/trunk/bigboard/stocks/search

[commits mugshot org]

Author: hp
Date: 2007-11-06 11:05:07 -0600 (Tue, 06 Nov 2007)
New Revision: 6873

Modified:
   bigboard/trunk/bigboard/stocks/search/SearchStock.py
Log:
fix search results popup to get things under the right heading

Modified: bigboard/trunk/bigboard/stocks/search/SearchStock.py
===================================================================
--- bigboard/trunk/bigboard/stocks/search/SearchStock.py	2007-11-05 18:38:10 UTC (rev 6872)
+++ bigboard/trunk/bigboard/stocks/search/SearchStock.py	2007-11-06 17:05:07 UTC (rev 6873)
@@ -232,6 +232,26 @@
                                     xml.sax.saxutils.escape(text[j:]))
         return markup
 
+    def __find_insert_iter(self, heading):
+        """Find where to append underneath a given heading"""
+        seen = False        
+        iter = self.__store.get_iter_first()
+        while iter:
+            row_heading = self.__store.get_value(iter, 3)
+
+            if row_heading == heading:
+                seen = True
+            elif seen:
+                ## return the first iter that does not match the heading but is after the heading
+                ## (this skips all existing stuff with the heading, as well as the heading row itself)
+                return iter
+
+            iter = self.__store.iter_next(iter)
+
+        ## if the insertion point is at the end, we return None
+        return None
+        
+
     def add_results(self, results):
         _logger.debug("adding %d results" % (len(results)))
         
@@ -257,9 +277,10 @@
                 icon = gtk.gdk.pixbuf_new_from_file_at_size(icon, self.__icon_size, self.__icon_size)
             icon_url = r.get_icon_url()
 
-            self.__store.append(None, [ r, icon,
-                                        markup,
-                                        heading, 1, icon_url ] )
+            end_of_heading = self.__find_insert_iter(heading)
+            self.__store.append(end_of_heading, [ r, icon,
+                                                  markup,
+                                                  heading, 1, icon_url ] )
             if icon_url:
                 image_cache = URLImageCache()
                 image_cache.get(icon_url, self.__handle_image_load, self.__handle_image_error, format='pixbuf')
@@ -271,12 +292,6 @@
         if len(rows) == 0 or rows[0][0] == 0 or rows[0][0] == 1:
             select_first_row = True;
 
-        ## sort headings before search entries
-        self.__store.set_sort_column_id(4, gtk.SORT_ASCENDING)
-        
-        ## sort headings in alpha order
-        self.__store.set_sort_column_id(3, gtk.SORT_ASCENDING)
-
         ## select first item if current selection was the first item before;
         ## by default tree view will have selected nothing, or will have
         ## moved the previous selection when it sorted.
@@ -503,7 +518,7 @@
 
             results = []
             for s in stuff_to_search_in:
-                if query in s:
+                if query.lower() in s.lower():
                     results.append(TestSearchResult(self, s + " " + self.__heading))
             consumer.add_results(results)