X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=3fe863719d94851385d7f8b4e544fb4376e9ff90;hb=a1b7edb2f925e22c9ad843496e13c687ce395e44;hp=eba924705dc00a72d0bc60f39c1cda9b49455f43;hpb=bcf579e3311f0d9f968338dc419e9a43b48414ba;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index eba9247..3fe8637 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -1,12 +1,16 @@
 """
    Convert a bkmk database back to bookmarks.html
 
-   Written by BroytMann. Copyright (C) 2000-2004 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design
 """
 
 
 import os
-NSFORMAT = os.environ.has_key("BKMK_NSFORMAT")
+MZFORMAT = os.environ.has_key("BKMK_MZFORMAT")
+if MZFORMAT:
+   NSFORMAT = True
+else:
+   NSFORMAT = os.environ.has_key("BKMK_NSFORMAT")
 
 
 def dump_comment(comment):
@@ -35,8 +39,7 @@ class writer_html(Writer):
 
    def start_folder(self, f, level):
       self.outfile.write(ind_s*level + '<DT><H3 ADD_DATE="%s"' % f.add_date)
-      if f.last_modified:
-         self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
+      if MZFORMAT and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
       self.outfile.write('>%s</H3>\n' % f.name)
       self._folder(f, level)
 
@@ -45,7 +48,10 @@ class writer_html(Writer):
 
    def bookmark(self, b, level):
       self.outfile.write(ind_s*(level+1) + '<DT><A HREF="%s" ADD_DATE="%s" LAST_VISIT="%s" LAST_MODIFIED="%s"' % (b.href, b.add_date, b.last_visit, b.last_modified))
-      if b.keyword: self.outfile.write(' SHORTCUTURL="%s"' % b.keyword)
+      if MZFORMAT:
+         if b.keyword: self.outfile.write(' SHORTCUTURL="%s"' % b.keyword)
+         if b.icon: self.outfile.write(' ICON="%s"' % b.icon)
+         if b.charset: self.outfile.write(' LAST_CHARSET="%s"' % b.charset)
       self.outfile.write('>%s</A>\n' % b.name)
       if b.comment: self.outfile.write('<DD>%s\n' % dump_comment(b.comment))