X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=a9567e22134fd70b9adcefe788c2b2bb3a45746f;hb=742ce372d408094cf0e5cc6b0a11c93afda3e08b;hp=6cb12d933379e879b4f85904f76a3ac86ded9beb;hpb=caa777b87bd46efba408d5fcf28b690bd28fe30b;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 6cb12d9..a9567e2 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,7 +1,7 @@
 """
    Objects to represent bookmarks.html structure
 
-   Written by Oleg BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+   Written by Oleg Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
 import os, cgi
@@ -44,13 +44,14 @@ class Bookmark:
    isBookmark = 1
 
    def __init__(self, href, add_date, last_visit=None, last_modified=None,
-         keyword=None, comment='', icon=None, charset=None):
+         keyword=None, comment='', icon_href=None, icon=None, charset=None):
       self.href = href
       self.add_date = add_date
       self.last_visit = last_visit
       self.last_modified = last_modified
       self.keyword = keyword
       self.comment = comment
+      self.icon_href = icon_href
       self.icon = icon
       self.charset = charset
 
@@ -172,5 +173,12 @@ def break_tree(linear):
 
 def quote_title(title):
    if BKMK_FORMAT == "MOZILLA":
-      title = cgi.escape(title, 1).replace("'", "'")
+      title = title.replace("'", "'")
+   return title
+
+def unquote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      from HTMLParser import HTMLParser
+      title = HTMLParser().unescape(title.replace("&", '&'))
+      title = title.replace("'", "'")
    return title