Changeset 31 for storage

Timestamp:

07/09/06 12:42:50 (2 years ago)

Author:

ploum

Message:

Transition to XML completed. Bookmarks are now described in XML 1.0.
This is needed in order to implement bookmarks storage and advanced search
support for bookmarks

Files:

• storage/bookmarks_store.py (modified) (2 diffs)

storage/bookmarks_store.py

@@ -22 +22 @@
                 # essai temporaire
                 # normalement ici on lit le fichier de préférences
-                self.listing.insert_before(None, ["3 results", 2, "nautilus evolution crash"])
-                self.listing.insert_before(None, ["many results", 2, "microsoft has majority"])
-                self.listing.insert_before(None, ["Evo's bugs", 3, "evolution refresh folder"])
-                self.listing.insert_before(None, ["Bug #42", 1, "42"])
-                self.listing.insert_before(None, ["Content in +text mode", 1, "51835"])
-                self.listing.insert_before(None, ["Search in bugs+text", 1, "51836"])
+                self.listing.insert_before(None, ["Evo 2 results", 2, "<?xml version=\"1.0\" ?>\n<bookmark title=\"(evolution) imap filter\" type=\"3\"><search>imap filter</search><product>evolution</product></bookmark>"])
+                self.listing.insert_before(None, ["many results", 2, "<?xml version=\"1.0\" ?>\n<bookmark title=\"microsoft has majority\" type=\"2\"><search>microsoft has majority</search></bookmark>"])
+                self.listing.insert_before(None, ["Evo's bugs", 3, "<?xml version=\"1.0\" ?>\n<bookmark title=\"(evolution)\" type=\"3\"><product>evolution</product></bookmark>"])
+                self.listing.insert_before(None, ["Bug #42", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #42\" type=\"1\"><bug>42</bug></bookmark>"])
+                self.listing.insert_before(None, ["Content in +text mode", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #51835\" type=\"1\"><bug>51835</bug></bookmark>"])
+                self.listing.insert_before(None, ["Search in bugs+text", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #51836\" type=\"1\"><bug>51836</bug></bookmark>"])
 
         
@@ -53 +53 @@
                 zetuple = path.get_selection().get_selected()
                 method = zetuple[0].get_value(zetuple[1],1)
+                string = zetuple[0].get_value(zetuple[1],2)
+                doc2 = xml.dom.minidom.parseString(string)
+                bmark = doc2.getElementsByTagName("bookmark")[0]
+                #method =  int(bmark.getAttribute("type"))
                 if method == 1:
                         # besoin de programmation défensive ici FIXME
-                        bug = int(zetuple[0].get_value(zetuple[1],2))
+                        #bug = int(zetuple[0].get_value(zetuple[1],2))
+                        element = bmark.getElementsByTagName("bug")[0]
+                        bug = int(element.childNodes[0].nodeValue)
                 elif method == 2:
-                        search = zetuple[0].get_value(zetuple[1],2)
+                        s_element = bmark.getElementsByTagName("search")[0]
+                        search = s_element.childNodes[0].nodeValue
                 elif method == 3:
-                        string = zetuple[0].get_value(zetuple[1],2)
-                        #here we have to change to have XML
-                        array = string.split(None,1)
-                        product = array[0]
-                        if len(array) < 2 :
+                        s_element = bmark.getElementsByTagName("search")
+                        p_element = bmark.getElementsByTagName("product")[0]
+                        product = p_element.childNodes[0].nodeValue
+                        if len(s_element) == 0 :
                                 search = None
                         else :  
-                                search = array[1]
+                                search = s_element[0].childNodes[0].nodeValue
                 self.bug = bug
                 self.method = method