Some fixes for catalogue loading

diff --git a/js/app/Catalogue.coffee b/js/app/Catalogue.coffee
index c556e5b..aeef42d 100644 (file)
--- a/js/app/Catalogue.coffee
+++ b/js/app/Catalogue.coffee
@@ -7,23 +7,30 @@ class Readings.Catalogue
     this
 
   init: (db) ->
     this
 
   init: (db) ->

+    unneded_stmts = (stmt, idx) ->
+      stmt.indexOf("PRAGMA")==0 or
+      stmt.indexOf("BEGIN TRANSACTION")==0 or
+      stmt.indexOf("COMMIT")==0 or
+      /^\s*$/.exec stmt
+

     if not db?
       db = @db
     console.log "initializing DB"
     db.changeVersion "", Readings.config.get 'db_version'
     if not db?
       db = @db
     console.log "initializing DB"
     db.changeVersion "", Readings.config.get 'db_version'

-    $.ajax "initdb.sql"
+    $.ajax Readings.config.get('initdburl'),

       type: "GET"
       dataType: 'text'
       success: (sql) =>
         sql = sql.split /;\n/
       type: "GET"
       dataType: 'text'
       success: (sql) =>
         sql = sql.split /;\n/

-        sql = sql.slice(1,-2)
+        sql = $.grep sql, unneded_stmts, true

 
         create = (tx) =>
           for stmt in sql
 
         create = (tx) =>
           for stmt in sql

-            console.log stmt

             tx.executeSql stmt, [],
               (tx,rs) => true,
             tx.executeSql stmt, [],
               (tx,rs) => true,

-              (tx,err) => console.error(err)
+              (tx,err) =>
+                console.error("error for #{stmt}")
+                console.error(err)

 
         db.transaction create
       error: =>
 
         db.transaction create
       error: =>

diff --git a/js/app/Catalogue.js b/js/app/Catalogue.js
index 38fbce6..c11357b 100644 (file)
--- a/js/app/Catalogue.js
+++ b/js/app/Catalogue.js
@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.3.3

 (function() {
 
   Readings.Catalogue = (function() {
 (function() {
 
   Readings.Catalogue = (function() {


@@ -14,28 +13,30 @@
     };
 
     Catalogue.prototype.init = function(db) {
     };
 
     Catalogue.prototype.init = function(db) {

-      var _this = this;
-      if (!(db != null)) {
-        db = this.db;
-      }
+      var unneded_stmts,
+        _this = this;
+      unneded_stmts = function(stmt, idx) {
+        return stmt.indexOf("PRAGMA") === 0 || stmt.indexOf("BEGIN TRANSACTION") === 0 || stmt.indexOf("COMMIT") === 0 || /^\s*$/.exec(stmt);
+      };
+      if (!(db != null)) db = this.db;

       console.log("initializing DB");
       db.changeVersion("", Readings.config.get('db_version'));
       console.log("initializing DB");
       db.changeVersion("", Readings.config.get('db_version'));

-      return $.ajax("initdb.sql", {
+      return $.ajax(Readings.config.get('initdburl'), {

         type: "GET",
         dataType: 'text',
         success: function(sql) {
           var create;
           sql = sql.split(/;\n/);
         type: "GET",
         dataType: 'text',
         success: function(sql) {
           var create;
           sql = sql.split(/;\n/);

-          sql = sql.slice(1, -2);
+          sql = $.grep(sql, unneded_stmts, true);

           create = function(tx) {
             var stmt, _i, _len, _results;
             _results = [];
             for (_i = 0, _len = sql.length; _i < _len; _i++) {
               stmt = sql[_i];
           create = function(tx) {
             var stmt, _i, _len, _results;
             _results = [];
             for (_i = 0, _len = sql.length; _i < _len; _i++) {
               stmt = sql[_i];

-              console.log(stmt);

               _results.push(tx.executeSql(stmt, [], function(tx, rs) {
                 return true;
               }, function(tx, err) {
               _results.push(tx.executeSql(stmt, [], function(tx, rs) {
                 return true;
               }, function(tx, err) {

+                console.error("error for " + stmt);

                 return console.error(err);
               }));
             }
                 return console.error(err);
               }));
             }


@@ -62,9 +63,9 @@
     };
 
     Catalogue.prototype.map_rs = function(rs, mapper) {
     };
 
     Catalogue.prototype.map_rs = function(rs, mapper) {

-      var i, objs, _i, _ref;
+      var i, objs, _ref;

       objs = [];
       objs = [];

-      for (i = _i = 0, _ref = rs.rows.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+      for (i = 0, _ref = rs.rows.length; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {

         objs.push(mapper(rs.rows.item(i)));
       }
       return objs;
         objs.push(mapper(rs.rows.item(i)));
       }
       return objs;


@@ -74,9 +75,9 @@
       var rs_to_tags,
         _this = this;
       rs_to_tags = function(tx, data) {
       var rs_to_tags,
         _this = this;
       rs_to_tags = function(tx, data) {

-        var i, tags, _i, _ref;
+        var i, tags, _ref;

         tags = [];
         tags = [];

-        for (i = _i = 0, _ref = data.rows.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+        for (i = 0, _ref = data.rows.length; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {

           tags.push(new Readings.Tag(data.rows.item(i)));
         }
         return callback(tags);
           tags.push(new Readings.Tag(data.rows.item(i)));
         }
         return callback(tags);

diff --git a/js/app/app.coffee b/js/app/app.coffee
index 2f447d5..78429b2 100644 (file)
--- a/js/app/app.coffee
+++ b/js/app/app.coffee
@@ -15,7 +15,8 @@ Readings.init = ->
   if Readings.initialized?
     return
   Readings.config = new Readings.Config
   if Readings.initialized?
     return
   Readings.config = new Readings.Config

-    wlurl: 'http://readings.local'
+    wlurl: 'http://dev.wolnelektury.pl'
+    initdburl: 'http://dev.wolnelektury.pl/media/api/mobile/initial/initial.sql'

     categories:
       'author': 'autor',
       'epoch': 'epoka',
     categories:
       'author': 'autor',
       'epoch': 'epoka',

diff --git a/js/app/app.js b/js/app/app.js
index 01d1f4a..b95b86e 100644 (file)
--- a/js/app/app.js
+++ b/js/app/app.js
@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.3.3

 (function() {
   var rcategory, rtag, rtagid;
 
 (function() {
   var rcategory, rtag, rtagid;
 


@@ -17,11 +16,10 @@
   };
 
   Readings.init = function() {
   };
 
   Readings.init = function() {

-    if (Readings.initialized != null) {
-      return;
-    }
+    if (Readings.initialized != null) return;

     Readings.config = new Readings.Config({
     Readings.config = new Readings.Config({

-      wlurl: 'http://readings.local',
+      wlurl: 'http://dev.wolnelektury.pl',
+      initdburl: 'http://dev.wolnelektury.pl/media/api/mobile/initial/initial.sql',

       categories: {
         'author': 'autor',
         'epoch': 'epoka',
       categories: {
         'author': 'autor',
         'epoch': 'epoka',


@@ -71,9 +69,7 @@
     var tag, tag_id, tag_id_m,
       _this = this;
     tag_id_m = rtagid.exec($(this).attr('data-url'));
     var tag, tag_id, tag_id_m,
       _this = this;
     tag_id_m = rtagid.exec($(this).attr('data-url'));

-    if (tag_id_m != null) {
-      tag_id = tag_id_m[1];
-    }
+    if (tag_id_m != null) tag_id = tag_id_m[1];

     return tag = Readings.catalogue.withTag(tag_id, function(tag) {
       return $(_this).Readings('list', {
         fetch: function(cb) {
     return tag = Readings.catalogue.withTag(tag_id, function(tag) {
       return $(_this).Readings('list', {
         fetch: function(cb) {