From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 12 Jun 2018 13:31:46 +0000 (+0100)
Subject: www/dbq/dbq.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=0093cd85bcda915111d68503f8ddff87a74a07d5;p=nb.git

www/dbq/dbq.php
---

diff --git a/bin/nb-run-parts b/bin/nb-run-parts
index 95e9d29b..8d635495 100755
--- a/bin/nb-run-parts
+++ b/bin/nb-run-parts
@@ -21,6 +21,9 @@ for script in $DIR/*; do
 
   log="$LOG_DIR/$name.log"
 
-  echo $name $script
+  cat <<EOF
+echo $$ > "$lock"
+$name $script > "$log"
+EOF
 
 done
diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index b8809b37..63f83c4a 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -393,10 +393,8 @@ class DbQ extends nb {
 
 			$this->db->__construct($connect);
 			$this->db->connect();
-			$this->db->html_base = $this->base;
-			$this->db->base = $this->base.'/'.$this->db->id;
-			return $this->db;
-		}
+# NB 11.06.18 			return $this->db;
+		} else {
 
 		// Re use
 		if (!empty($this->db)) return $this->db;
@@ -411,7 +409,12 @@ class DbQ extends nb {
 		}
 
 		$this->db = new Db(['conf'=>$DB_CONFS]);
+		}
 
+		$this->db->html_base = $this->base;
+		#$this->db->base = ($this->base ? $this->base : '/').$this->db->id;
+		$this->db->base = $this->base . ($this->db->id ? '/' . $this->db->id : '');
+		#debug($this->db->base);
 		return $this->db;
 	}