Removed svn:keywords. Extended copyright to 2012.

[bookmarks_db.git] / Storage / bkmk_stjson.py

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index 1a7ee16c4f8c48e0ede0ab56f25ebe7b2d107bdb..fd55a39cd9e948e627a77171b1062796524bc1d9 100644 (file)
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -3,11 +3,8 @@
 This file is a part of Bookmarks database and Internet robot.
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010, 2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['storage_json']
@@ -75,20 +72,13 @@ class storage_json(Walker):
         dict["type"] = "text/x-moz-place"
         dict["uri"] = uri = b.href
         if uri.startswith('place:'):
-            if uri.startswith('place:sort=8') \
-                    or uri.startswith('place://sort=8'):
-                value = 'MostVisited'
-            elif uri.startswith('place://redirectsMode'):
-                value = 'Most Visited'
-            elif uri.startswith('place:folder=BOOKMARKS_MENU') \
-                    or uri.startswith('place://folder=BOOKMARKS_MENU'):
-                value = 'RecentlyBookmarked'
-            elif uri.startswith('place://folder'):
+            if uri.startswith('place:folder'):
                 value = 'Recently Bookmarked'
-            elif uri.startswith('place:sort=14') \
-                    or uri.startswith('place://sort=14'):
-                value = 'RecentTags'
-            elif uri.startswith('place://type'):
+            elif uri.startswith('place:sort=8') or \
+                    uri.startswith('place:redirectsMode'):
+                value = 'Most Visited'
+            elif uri.startswith('place:sort=14') or \
+                    uri.startswith('place:type=6'):
                 value = 'Recent Tags'
             else:
                 raise ValueError('UNKNOWN place URI: %s' % uri)