Builder/Provider/Database/generate.js

[app.Builder.js] / Builder / Provider / Database / generate.js

diff --git a/Builder/Provider/Database/generate.js b/Builder/Provider/Database/generate.js
index 648edf3..44e14d7 100644 (file)
--- a/Builder/Provider/Database/generate.js
+++ b/Builder/Provider/Database/generate.js
@@ -57,23 +57,27 @@ Gda.DataSelect.prototype.fetchAll = function()
     for (var i =0;i < this.get_n_columns(); i++) {
         cols.push(this.get_column_name(i));
     }
-    print(JSON.stringify(cols, null,4));
+    //print(JSON.stringify(cols, null,4));
     var iter = this.create_iter();
     var res = [];
-    while (iter.move_next()) {
+    //print(this.get_n_rows());
+    var _this = this;
+    for (var r = 0; r < this.get_n_rows(); r++) {
+        
         // single clo..
+        //print("GOT ROW");
         if (cols.length == 1) {
-            res.push(iter.get_value_at(0).get_string());
+            res.push(this.get_value_at(0,r).get_string());
             continue;
         }
         var add = { };
         
         cols.forEach(function(n,i) {
-           var val = iter.get_value_at(i);
-           var type = GObject.type_name(val.g_type) ;
-           var vs = type == 'GdaBlob' ? val.value.to_string(1024) : val.value;
-         p  rint(n + " : TYPE: " + GObject.type_name(val.g_type) + " : " + vs);
-            print (n + '=' + iter.get_value_at(i).value);
+            var val = _this.get_value_at(i,r);
+            var type = GObject.type_name(val.g_type) ;
+            var vs = ['GdaBinary', 'GdaBlob' ].indexOf(type) > -1 ? val.value.to_string(1024) : val.value;
+            //print(n + " : TYPE: " + GObject.type_name(val.g_type) + " : " + vs);
+            //print (n + '=' + iter.get_value_at(i).value);
             add[n] = vs;
         });
         
@@ -96,9 +100,11 @@ var map = {
     'varchar' : 'string',
     'text' : 'string',
     'longtext' : 'string',
+    'tinytext' : 'string',
     'mediumtext' : 'string',
     'enum' : 'string',
-    
+    'timestamp' : 'number',
+    'blob' : 'text'
     
 }
 
@@ -135,17 +141,21 @@ if (File.isDirectory(cfg.INI)) {
 
     //--- load ini files..
     // this is very specific.
-    var dirs = File.list( GLib.get_home_dir() + '/gitlive').filter( 
-        function(e) { return e.match(/^Pman/); }
+    
+    var dirs = File.list( cfg.INI + '/Pman').filter( 
+        function(e) { 
+            if (!File.isDirectory(cfg.INI + '/Pman/' + e + '/DataObjects')) {
+                return false;
+            }
+            return true;
+        }
     );
     
+     
     dirs.forEach(function(d) {
         // this currently misses the web.*/Pman/XXXX/DataObjects..
-        var path = GLib.get_home_dir() + '/gitlive/' + d + '/DataObjects';
-        if (!File.isDirectory(path)) {
-            path = GLib.get_home_dir() + '/gitlive/' + d + '/Pman/DataObjects';
-        }
-        
+        var path = cfg.INI + '/Pman/' + d + '/DataObjects';
+         
         if (!File.isDirectory(path)) {
             return; //skip
         }
@@ -189,7 +199,7 @@ print(JSON.stringify(ini, null,4));
 var tables = Gda.execute_select_command(cnc, "SHOW TABLES").fetchAll();
 var readers = [];
 tables.forEach(function(table) {
-    print(table);
+    //print(table);
     var schema = Gda.execute_select_command(cnc, "DESCRIBE `" + table+'`').fetchAll();
     var reader = []; 
     var colmodel = []; 
@@ -315,6 +325,8 @@ tables.forEach(function(table) {
                 '*prop' : 'store',
                 'xtype' : 'Store',
                 '|xns' : 'Roo.data',
+                'remoteSort' : true,
+                '|sortInfo' : '{ direction : \'ASC\', field: \'id\' }',
                 listeners : {
                     '|beforeload' : 'function (_self, o)' +
                     "{\n" +
@@ -378,8 +390,12 @@ readers.forEach(function(reader) {
     // we have a map..
     for (var col in ini[reader.table]) {
         var kv = ini[reader.table][col].split(':');
-        var add = readers.filter(function(r) { return r.table == kv[0] })[0];
         
+        
+        var add = readers.filter(function(r) { return r.table == kv[0] })[0];
+        if (!add) {
+            continue;
+        }
         // merge in data (eg. project_id => project_id_*****
      
         add.oreader.forEach(function(or) {
@@ -394,7 +410,10 @@ readers.forEach(function(reader) {
         if (add.combofields.length < 2) {
             continue;
         }
-        
+        if (typeof(reader.form[col]) == 'undefined') {
+            print("missing linked column " + col);
+            continue;
+        }
         
         var combofields_name = add.combofields[1].name;
         var old =   reader.form[col];
@@ -537,7 +556,7 @@ readers.forEach(function(reader) {
                                             "   //}); \n"+
                                             "}\n"
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Edit",
@@ -560,7 +579,7 @@ readers.forEach(function(reader) {
                                             "}\n" 
                                         
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Delete",
@@ -574,7 +593,7 @@ readers.forEach(function(reader) {
                                             "}\n"+
                                             "        "
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 }
                             ]
                         }, // end toolbar