js schema version checking; misc fixes

diff --git a/feedlist.js b/feedlist.js
index 29de567bcecf3a680e1bcd60fcb2834756168746..93164fe5395ff8ac0debc76ce94c54508b0548c8 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -46,11 +46,12 @@ function render_offline_feedlist() {
                                [id]);
                        var unread = 0;
 
-                       if (rs.isValidRow()) {
+                       if (rs_u.isValidRow()) {
                                unread = rs_u.field(0);
                                if (!unread) unread = 0;
                        }
 
+
                        var feed_icon = "";
 
                        if (has_icon) {

diff --git a/tt-rss.js b/tt-rss.js
index b8b36e0956f8fd571ac39de0fc6d41522824b896..ab62a85fa05c4aac63a11379013a4b6ab94ef8d2 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1,3 +1,5 @@
+var SCHEMA_VERSION = 1;
+
 var total_unread = 0;
 var first_run = true;
 var display_tags = false;
@@ -1506,11 +1508,29 @@ function init_gears() {
                        db = google.gears.factory.create('beta.database');
                        db.open('tt-rss');
 
+                       db.execute("CREATE TABLE IF NOT EXISTS version (schema_version text)");
+
+                       var rs = db.execute("SELECT schema_version FROM version");
+
+                       var version = "";
+
+                       if (rs.isValidRow()) {
+                               version = rs.field(0);
+                       }
+
+                       if (version != SCHEMA_VERSION) {
+                               db.execute("DROP TABLE cache");
+                               db.execute("DROP TABLE feeds");
+                               db.execute("DROP TABLE articles");
+                               db.execute("INSERT INTO version (schema_version) VALUES (?)", 
+                                       [SCHEMA_VERSION]);
+                       }
+
                        db.execute("CREATE TABLE IF NOT EXISTS cache (id text, article text, param text, added text)");
 
                        db.execute("CREATE TABLE if not exists feeds (id integer, title text, has_icon integer)");
 
-                       db.execute("CREATE TABLE if not exists articles (id integer, feed_id integer, title text, link text, guid text, updated text, content text, tags text, unread text, marked text)");
+                       db.execute("CREATE TABLE if not exists articles (id integer, feed_id integer, title text, link text, guid text, updated text, content text, tags text, unread text, marked text, added text)");
 
                        var qmcDownload = document.getElementById("qmcDownload");
                        if (qmcDownload) Element.show(qmcDownload);
@@ -1528,8 +1548,13 @@ function init_offline() {
        try {
                offline_mode = true;
 
-               render_offline_feedlist();
+               Element.hide("dispSwitchPrompt");
+               Element.hide("feedBrowserPrompt");
+               Element.hide("quickMenuChooser");
+
+               init_params["theme"] = "";
 
+               render_offline_feedlist();
                remove_splash();
        } catch (e) {
                exception_error("init_offline", e);
@@ -1569,13 +1594,17 @@ function offline_download_parse(stage, transport) {
                                        var a = eval("("+articles[i].firstChild.nodeValue+")");
                                        articles_found++;
                                        if (a) {
+
+                                               var date = new Date();
+                                               var ts = Math.round(date.getTime() / 1000);
+
                                                db.execute("DELETE FROM articles WHERE id = ?", [a.id]);
                                                db.execute("INSERT INTO articles "+
                                                "(id, feed_id, title, link, guid, updated, content, "+
-                                                       "unread, marked, tags) "+
-                                               "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", 
+                                                       "unread, marked, tags, added) "+
+                                               "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", 
                                                        [a.id, a.feed_id, a.title, a.link, a.guid, a.updated, 
-                                                               a.content, a.unread, a.marked, a.tags]);
+                                                               a.content, a.unread, a.marked, a.tags, ts]);
 
                                        }
                                }