X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=dbgenerate.js;h=0ea16fda806638b796beb905bec622c88ae15d72;hb=119290bc3234e9ece1c64dbd72ca486d9633b5b7;hp=95bdabf4df11018826c1835af7d6a82d5206d027;hpb=91c673154a02e86c4bd61960fe9ce4be5672880b;p=app.Builder.js

diff --git a/dbgenerate.js b/dbgenerate.js
index 95bdabf4d..0ea16fda8 100644
--- a/dbgenerate.js
+++ b/dbgenerate.js
@@ -55,7 +55,7 @@ var o = new Options({
         { arg_long : 'DBTYPE' , arg_short : 't', description : 'Database Type (eg. MySQL or PostgreSQL ' },
         { arg_long : 'DBNAME' , arg_short : 'd', description : 'Database Name' },
         { arg_long : 'USERNAME' , arg_short : 'u', description : 'Username'},
-        { arg_long : 'PASSWORD' , arg_short : 'p', description : '' , arg_default :'' },
+        { arg_long : 'PASSWORD' , arg_short : 'p', description : 'Password' , arg_default :'' },
         { arg_long : 'INI' , arg_short : 'I', description :
                     'Either base directory which has Pman/***/DataObjects/***.links.ini or location of ini file.' },
     ]
@@ -159,16 +159,22 @@ function readIni(fn)
    
     var groups = key_file.get_groups();
     groups.forEach(function(g) {
+        //print("KEY:"+g);
         ini[g] = {}
-           print("KEY:"+g);
+        
         var keys = key_file.get_keys(g);
         if (!keys) { return; }
-         keys.forEach(function(k) {
-            ini[g][k] = key_file.get_value(g,k);
-        })
-    })
-    
+        
+        keys.forEach(function(k) {
+                print("GET val: " + k);
+                ini[g][k] = key_file.get_value(g,k);
+                print(ini[g][k] );
+        });
+        //print("DONE KEY:"+g);
+    });
+    //print("DONE KEYS");
 }
+ 
 if (File.isFile(cfg.INI)) {
     if (cfg.INI.match(/links\.ini$/)) {
         readIni(cfg.INI);
@@ -228,7 +234,7 @@ if (File.isDirectory(cfg.INI)) {
 }
 //print(JSON.stringify(ini, null,4));
  //console.dump(ini);
-
+print("DONE INI");
 
  //Seed.quit();
 
@@ -273,7 +279,11 @@ switch(cfg.DBTYPE) {
                 
         break;
     default:
-        throw "Invalid data base type " + cfg.DBTYPE + " should be MySQL or PostgreSQL";
+        throw {
+             name: "ArgumentError", 
+             message: "Invalid data base type " + cfg.DBTYPE + " should be MySQL or PostgreSQL"
+         };
+            
 /*
            "Field": "province",
         "Type": "varchar(255)",