cleaning

diff --git a/bin/nb-update b/bin/nb-update
index 9adce95ba966300935f8d56c9ff85ba2b6ba65ef..08f147f10d3be070c52212433196bae30f4fb8de 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -43,8 +43,7 @@ for repo in $(nb-repo-dirs); do
     su $user -c "$cmd"
   else
     echo "Wrong user current user=$USER repo user=$user"
-    echo
-    continue
+    false
   fi
   ret=$?
 

diff --git a/etc/dbq.yaml b/etc/dbq.yaml
index 2f3e6fc5ecfb59f97002260d1e3705fa180950cc..4c1f4af35e944826367537ee359f42b3d832d1e6 100644 (file)
--- a/etc/dbq.yaml
+++ b/etc/dbq.yaml
@@ -1,17 +1,6 @@
 _mysql:
   type: mysql
 
-crypt:
-  type: sqlite
-  host: /dev/shm/crypt.db
-
-rt:
-  type: pgsql
-  host: db.rt.semantico.net
-  name: rtdb
-  user: rtuser
-  title: 'RT'
-
 izi:
   title: Izi Admin
   host: admin.izideal.vpn
@@ -39,3 +28,7 @@ izi-dev:
   #user: nico
   _import:
     - izi
+
+crypt:
+  type: sqlite
+  host: /dev/shm/crypt.db

diff --git a/etc/dbq/ui.php b/etc/dbq/ui.php
index e2b1bd54dd897b9379b7f584a227ca1c3835d259..3ab53142e8b16874d302ec2b6cffe727c6431ae7 100644 (file)
--- a/etc/dbq/ui.php
+++ b/etc/dbq/ui.php
@@ -2,7 +2,7 @@
 $DBQ['_ui'] = array(
   'title' => 'Semantico UI',
   'type' => 'sqlite',
-  'host' => (file_exists('/opt/www/sem_ui/var/db/semantico.db') ?  '/opt/www/sem_ui/var/db/semantico.db' : "$DIR_SQLITE/semantico.db"),
+  'host' => (file_exists('/opt/www/sem_ui/var/db/semantico.db') ?  '/opt/www/sem_ui/var/db/semantico.db' : "$DIR_SQLITE/semantico.sqlite"),
   'default_table' => 'node',
 
   'tables' => array(

diff --git a/etc/profile.d/dbq.sh b/etc/profile.d/dbq.sh
index f418615238e0292407292bfffc0a7d2c69c44217..ae38b074b9d8eacfb871060bb856405d95a5d5b0 100644 (file)
--- a/etc/profile.d/dbq.sh
+++ b/etc/profile.d/dbq.sh
@@ -1,3 +1,5 @@
+[ -z "$DBQ_HOST" ] && DBQ_HOST='db.nbdom.net'
+
 dbq2sqlite() {
   dbq f=text a=db.dump db.type=sqlite $@
 }

diff --git a/lib/php/db.php b/lib/php/db.php
index ad4a54f79ca890434716b4a2c276cd7bceeb47fd..978fe6d3b5cf4ccb668322e4871344df3866da75 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -433,10 +433,12 @@ class Db extends nb {
 
       $sql = $this->method('tables');
 
-      foreach ($this->conn->query($sql,PDO::FETCH_ASSOC) as $row) {
-        #debug($row);
-        $name = current($row);
-        $this->table($name,$row+['status'=>$row]); # add to this->tables too !
+      if ($sql and !empty($this->conn)) {
+        foreach ($this->conn->query($sql,PDO::FETCH_ASSOC) as $row) {
+          #debug($row);
+          $name = current($row);
+          $this->table($name,$row+['status'=>$row]); # add to this->tables too !
+        }
       }
 
     }
@@ -975,7 +977,7 @@ class Db extends nb {
 
       $this->databases = [];
       $name = self::p('name','');
-      if ($sql = $this->conf_type('databases')) {
+      if ($sql = $this->conf_type('databases') and !empty($this->conn)) {
         $fct = '';
         if (is_array($sql)) list($sql,$fct) = count($sql)>1 ? $sql : [$sql[0],''];