Changeset 31 for page.py

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:

• page.py (modified) (3 diffs)

page.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import sys
-import string
+import sys, string, xml.dom.minidom
 try:
         import gtk
@@ -18 +17 @@
         string = widget.get_name()
         # this must be modified if we change the string representation
-        array=string.split("\n\n",2)
-        return array
+        doc = xml.dom.minidom.parseString(string)
+        bmark = doc.getElementsByTagName("bookmark")[0]
+        stype = int(bmark.getAttribute("type"))
+        title = bmark.getAttribute("title")
+        return [title, stype, string]
 
 def read_descr(string) :
@@ -55 +57 @@
                 zename=''
                 title=''
+                doc = xml.dom.minidom.Document()
+                bmark = doc.createElement("bookmark")
+                doc.appendChild(bmark)
                 if search_type == 1 :
+                        bmark.setAttribute("type","1")
                         title = "bug #%s"%args
-                        zename= "%s\n\n1\n\n%s" %(title,args)
+                        bmark.setAttribute("title", title)
+                        node = doc.createElement("bug")
+                        node_text = doc.createTextNode(args)
+                        node.appendChild(node_text)
+                        bmark.appendChild(node)
                 elif search_type == 2 :
                         search = args["search"]
                         title = "%s" %search
-                        zename = "%s\n\n2\n\n%s"%(title,search)
+                        bmark.setAttribute("type","2")
+                        bmark.setAttribute("title", title)
+                        node = doc.createElement("search")
+                        node_text = doc.createTextNode(search)
+                        node.appendChild(node_text)
+                        bmark.appendChild(node)         
                 elif search_type == 3 :
+                        bmark.setAttribute("type","3")
+                        search = args["search"]
                         product = args["product"]
-                        search = args["search"]
                         if search == None :
                                 title = "(%s)"%product
-                                descr = product
                         else :
                                 title = "(%s) %s"%(product,search)
-                                descr = "%s\n%s"%(product, search)
-                        zename = "%s\n\n3\n\n%s"%(title,descr)
+                                node = doc.createElement("search")
+                                node_text = doc.createTextNode(search)
+                                node.appendChild(node_text)
+                                bmark.appendChild(node)         
+                        
+                        bmark.setAttribute("title", title)
+                        prod = doc.createElement("product")
+                        prod_text = doc.createTextNode(product)
+                        prod.appendChild(prod_text)
+                        bmark.appendChild(prod)
+
+                zename = doc.toxml()
                 return [title, zename]