No need to call .lower() two times.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 345ef3a34cdfc40c652b274d99deb2753414e4be..a9567e22134fd70b9adcefe788c2b2bb3a45746f 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,11 +1,11 @@
 """
    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
-BKMK_FORMAT = os.environ.get("BKMK_FORMAT", '')
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
 
 class Folder(list):
@@ -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
 
@@ -164,7 +165,6 @@ def make_tree(linear):
    return root_folder
 
 def break_tree(linear):
-   root_folder = linear[0]
    del linear[0]
 
    for object in linear:
@@ -173,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