From 018144ce54f5005f1070510d59652d999aea68dd Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sat, 7 Mar 2020 16:09:37 -0700
Subject: [PATCH] dashboard tweaks

---
 QnetDB.cpp      | 27 +++++++++++++++++----------
 QnetGateway.cpp |  1 -
 example.php     |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/QnetDB.cpp b/QnetDB.cpp
index a0d3251..0784ad5 100644
--- a/QnetDB.cpp
+++ b/QnetDB.cpp
@@ -24,19 +24,26 @@ bool CQnetDB::Open(const char *name)
 	if (sqlite3_open(name, &db))
 		return true;
 
-	std::string sql =	"DROP TABLE IF EXISTS LHEARD; "
-	                	"CREATE TABLE LHEARD("
-							"mycall		TEXT PRIMARY KEY, "
-							"sfx		TEXT, "
-							"urcall		TEXT, "
-							"module		TEXT, "
-							"gateway	TEXT, "
-							"lasttime	INT NOT NULL"
-						") WITHOUT ROWID;";
+	std::string sql =	"DROP TABLE IF EXISTS LHEARD;";
 
 	char *eMsg;
 	if (SQLITE_OK != sqlite3_exec(db, sql.c_str(), NULL, 0, &eMsg)) {
-		fprintf(stderr, "CQnetDB::Open error: %s\n", eMsg);
+		fprintf(stderr, "CQnetDB::Open drop table error: %s\n", eMsg);
+		sqlite3_free(eMsg);
+		return true;
+	}
+
+	sql =	"CREATE TABLE LHEARD("
+				"mycall		TEXT PRIMARY KEY, "
+				"sfx		TEXT, "
+				"urcall		TEXT, "
+				"module		TEXT, "
+				"gateway	TEXT, "
+				"lasttime	INT NOT NULL"
+			") WITHOUT ROWID;";
+
+	if (SQLITE_OK != sqlite3_exec(db, sql.c_str(), NULL, 0, &eMsg)) {
+		fprintf(stderr, "CQnetDB::Open create table error: %s\n", eMsg);
 		sqlite3_free(eMsg);
 		return true;
 	}
diff --git a/QnetGateway.cpp b/QnetGateway.cpp
index 820b68f..2112439 100644
--- a/QnetGateway.cpp
+++ b/QnetGateway.cpp
@@ -1128,7 +1128,6 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const i
 						std::string gateway((const char *)g2buf.hdr.rpt2,   8);
 						rtrim(mycall);
 						rtrim(sfx);
-						rtrim(urcall);
 						qnDB.Update(mycall.c_str(), sfx.c_str(), urcall.c_str(), module.c_str(), gateway.c_str());
 					}
 
diff --git a/example.php b/example.php
index f1cfab0..40bee86 100644
--- a/example.php
+++ b/example.php
@@ -140,7 +140,7 @@ if ('true' == GetCFGValue('dash_show_ps') && `ps -aux | grep -e qn -e MMDVMHost
 	foreach ($lines as $line) {
 		echo str_replace(' ', '&nbsp;', $line), "<br>\n";
 	}
-	echo '</code><br>', "\n";
+	echo '</code>', "\n";
 }
 
 if ('true' == GetCFGValue('dash_show_lh')) {