From 0c874abcae378f4398a040e0575d12b681db5b35 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 13 Sep 2016 23:44:23 +0100
Subject: [PATCH] Bed

---
 lib/php/db/index.php                                     | 9 ---------
 lib/php/db/shell.php                                     | 7 ++-----
 lib/php/functions.php                                    | 5 ++++-
 lib/php/nb.php                                           | 1 +
 .../db => share/postgres}/postgres-create-functions.sql  | 0
 5 files changed, 7 insertions(+), 15 deletions(-)
 rename {lib/php/db => share/postgres}/postgres-create-functions.sql (100%)

diff --git a/lib/php/db/index.php b/lib/php/db/index.php
index beaf177e..0664afc1 100755
--- a/lib/php/db/index.php
+++ b/lib/php/db/index.php
@@ -7,15 +7,6 @@
 * lib/php/db/index.php
 */
 require_once(realpath(dirname(__FILE__).'/config.php'));
-# NB 13.09.16 require_once(realpath(dirname(__FILE__).'/../config.php'));
-# NB 13.09.16 require_once(realpath(dirname(__FILE__).'/../db.php'));
-# NB 13.09.16 
-# NB 13.09.16 Db::pinit();
-# NB 13.09.16 
-# NB 13.09.16 if(defined('DB_NO_INIT') and DB_NO_INIT) return true;
-# NB 13.09.16 #bye(Db::conf_load(array( Db::ROOT_DIR.'/etc/dbs.yaml','/etc/dbs.yaml' )));
-# NB 13.09.16 #$conf = Db::conf_load(array( Db::ROOT_DIR.'/etc/dbs.yaml','/etc/dbs.yaml' )); Db::init($conf);
-# NB 13.09.16 Db::init([Db::ROOT_DIR.'/etc/dbs.yaml',Db::ROOT_DIR.'/etc/dbs.php','/etc/dbs.yaml']);
 
 if(defined('DB_NO_ACTION') and DB_NO_ACTION) return true;
 
diff --git a/lib/php/db/shell.php b/lib/php/db/shell.php
index b0959f7c..fd07f729 100755
--- a/lib/php/db/shell.php
+++ b/lib/php/db/shell.php
@@ -1,23 +1,20 @@
 #!/usr/bin/env php
 <?php
-define('DB_NO_ACTION',true);
-#require_once(dirname(__FILE__).'/index.php');
 require_once(dirname(__FILE__).'/../config.php');
 require_once(dirname(__FILE__).'/../db.php');
 
 #
 # Default params
 #
-argv2request();
 
 # Set format from client Accept if != html
 #bye(out::client_type());
-Db::pdef('format',out::client_type());
+Db::pdef('format','human');
 
 #
 # Confs
 #
-$Confs = Db::conf_load(array( Db::ROOT_DIR.'/etc/dbs.yaml',Db::ROOT_DIR.'/etc/dbs.php','/etc/dbs.yaml' ));
+$Confs = Db::conf_load([ Db::ROOT_DIR.'/etc/dbs.yaml',Db::ROOT_DIR.'/etc/dbs.php','/etc/dbs.yaml' ]);
 
 #
 # Parse stdin
diff --git a/lib/php/functions.php b/lib/php/functions.php
index 7366c378..6a2c4482 100644
--- a/lib/php/functions.php
+++ b/lib/php/functions.php
@@ -62,7 +62,10 @@ function txt2md($txt) {
 
 function bye($msg='__bye__',$backtrace_deep=0) {
   #if ($msg) err($msg,'bye',$backtrace_deep === 0 ? 1 : $backtrace_deep);
-  if ($msg!=='__bye__') err($msg,'bye',( $backtrace_deep !== false ? (1+-1+$backtrace_deep) : $backtrace_deep ));
+  if ($msg!=='__bye__') {
+    err($msg,'bye',( $backtrace_deep !== false ? (1+-1+$backtrace_deep) : $backtrace_deep ));
+    exit(1);
+  }
   #if ($msg) err($msg,'bye',1+$backtrace_deep);
   exit;
   #die("Can't exit from BYE!!!");
diff --git a/lib/php/nb.php b/lib/php/nb.php
index d71a3fa8..0b446678 100644
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -14,6 +14,7 @@ if (class_exists('NB')) return;
 class NB {
 
   const ROOT_DIR = NB_ROOT;
+  const NB_ROOT = NB_ROOT;
 
   # Sql: elect type,ext from mime_type where ext in ('json','csv','txt','yaml','xml','html','doc','xls');
   protected static $content_types_aliases = array(
diff --git a/lib/php/db/postgres-create-functions.sql b/share/postgres/postgres-create-functions.sql
similarity index 100%
rename from lib/php/db/postgres-create-functions.sql
rename to share/postgres/postgres-create-functions.sql
-- 
2.47.3