From: Oleg Broytman <phd@phdru.name>
Date: Sun, 14 Oct 2007 10:06:51 +0000 (+0000)
Subject: Renamed BKMK_??FORMAT to BKMK_FORMAT.
X-Git-Tag: v4.5.3~280
X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=commitdiff_plain;h=6e90710dba7238b440aa7c5bb5e465de0fc259ed

Renamed BKMK_??FORMAT to BKMK_FORMAT.


git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@96 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23
---

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 775d336..7e652d2 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -6,16 +6,12 @@
 
 
 import os
-MZFORMAT = os.environ.has_key("BKMK_MZFORMAT")
-if MZFORMAT:
-   NSFORMAT = False
-else:
-   NSFORMAT = os.environ.has_key("BKMK_NSFORMAT")
+BKMK_FORMAT = os.environ.has_key("BKMK_FORMAT")
 
 
 def dump_comment(comment):
    comment = comment.replace("<BR>\n", "\n")
-   if NSFORMAT:
+   if BKMK_FORMAT == "NETSCAPE":
       comment = comment.replace("\n", "<BR>\n")
    return comment
 
@@ -39,7 +35,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 MZFORMAT and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
+      if (BKMK_FORMAT == "MOZILLA") 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)
 
@@ -48,7 +44,7 @@ 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 MZFORMAT:
+      if BKMK_FORMAT == "MOZILLA":
          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)
diff --git a/bkmk-chk b/bkmk-chk
index 5354ac9..b9f6637 100755
--- a/bkmk-chk
+++ b/bkmk-chk
@@ -12,4 +12,4 @@ BKMK_WRITER=flad db2bkmk.py || exit 1
 check_dups.py -s -l bookmarks.err || exit 1
 
 # Write results to output bookmarks files
-BKMK_MZFORMAT=TRUE db2bkmk.py || exit 1
+BKMK_FORMAT=MOZILLA db2bkmk.py || exit 1
diff --git a/bkmk-koi b/bkmk-koi
index 24b378d..bc073e8 100755
--- a/bkmk-koi
+++ b/bkmk-koi
@@ -5,8 +5,8 @@ PATH=$HOME/lib/bookmarks_db:$PATH
 
 bkmk2db || exit 1
 
-BKMK_NSFORMAT=TRUE
-export BKMK_NSFORMAT
+BKMK_FORMAT=NETSCAPE
+export BKMK_FORMAT
 
 db2bkmk.py || exit 1
 db2bkmk.py -p "Private links" -o public-koi.tmp || exit 1
diff --git a/bkmk-win b/bkmk-win
index 6c536ea..5e5739a 100755
--- a/bkmk-win
+++ b/bkmk-win
@@ -12,8 +12,8 @@ fromwin < bookmark.htm > bookmarks.html || exit 1
 
 bkmk2db || exit 1
 
-BKMK_NSFORMAT=TRUE
-export BKMK_NSFORMAT
+BKMK_FORMAT=NETSCAPE
+export BKMK_FORMAT
 
 db2bkmk.py -o private-win.tmp || exit 1
 db2bkmk.py -p "Private links" -o public-win.tmp || exit 1
diff --git a/mz2ns b/mz2ns
index f6de090..451c96e 100755
--- a/mz2ns
+++ b/mz2ns
@@ -4,7 +4,7 @@ PATH=$HOME/lib/bookmarks_db:$PATH
 
 bkmk2db || exit 1
 umask 077
-BKMK_NSFORMAT=TRUE db2bkmk.py || exit 2
+BKMK_FORMAT=NETSCAPE db2bkmk.py || exit 2
 
 sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&quot;/"/g' -e 's/&amp;/\&/g' \
    bookmarks.html >_tmp.$$ && \