X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=8b172fc372f39a029a1ad15ea2ff5b85e7276b14;hb=9edef5a570ea28f7c06d8d92fdd70afe0ea86809;hp=921dff908645cbbc9b3b07ff137a30104f62df24;hpb=042cfc1c844c147b59fa10d573912322b4fce7f1;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 921dff9..8b172fc 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -1,15 +1,19 @@
 """
    Convert a bkmk database back to bookmarks.html
 
-   Written by BroytMann. Copyright (C) 2000-2003 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2000-2004 PhiloSoft Design
 """
 
 
-import string
+import os
+NSFORMAT = os.environ.has_key("BKMK_NSFORMAT")
 
 
 def dump_comment(comment):
-   return string.replace(comment, "<BR>", "<BR>\n")
+   comment = comment.replace("<BR>\n", "\n")
+   if NSFORMAT:
+      comment = comment.replace("\n", "<BR>\n")
+   return comment
 
 
 ind_s = " "*4
@@ -24,10 +28,8 @@ class writer_html(Writer):
       self.outfile.write(ind_s*level + "<DL><p>\n")
 
    def root_folder(self, f):
-      header = string.replace(f.header, ".", ".\n")
-      header = string.replace(header, "<T", "\n<T", 3)
       self.outfile.write("<!DOCTYPE NETSCAPE-Bookmark-file-1>\n")
-      self.outfile.write(header + "\n")
+      self.outfile.write(f.header + "\n")
       self.outfile.write('<H1>%s</H1>\n\n' % f.name)
       self._folder(f, 0)
 
@@ -39,7 +41,9 @@ class writer_html(Writer):
       self.outfile.write(ind_s*level + "</DL><p>\n")
 
    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">%s</A>\n' % (b.href, b.add_date, b.last_visit, b.last_modified, b.name))
+      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)
+      self.outfile.write('>%s</A>\n' % b.name)
       if b.comment: self.outfile.write('<DD>%s\n' % dump_comment(b.comment))
 
    def ruler(self, r, level):