aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <>2006-01-20 15:58:05 +0000
committerreinelt <>2006-01-20 15:58:05 +0000
commitb18235a45d3cade7f862abec063f2e8121541a48 (patch)
treeefdaa21da22b860fcb680bf54a611db9fd6478c7
parent4651cdff898368b9a739c63028dad51af128f93e (diff)
downloadlcd4linux-b18235a45d3cade7f862abec063f2e8121541a48.tar.gz
[lcd4linux @ 2006-01-20 15:58:05 by reinelt]
MySQL::count() added again
Diffstat (limited to '')
-rw-r--r--lcd4linux.conf.sample8
-rw-r--r--plugin_mysql.c11
2 files changed, 10 insertions, 9 deletions
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 06c423e..7df0053 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -929,7 +929,7 @@ Layout testMySQL {
#Display 'LCM-162'
#Display 'CF631'
#Display 'CF632'
-Display 'CF633'
+#Display 'CF633'
#Display 'Curses'
#Display 'M50530-24x8'
#Display 'LCDTerm'
@@ -937,7 +937,7 @@ Display 'CF633'
#Display 'BA63'
#Display 'CT20x4'
#Display 'T6963-240x64'
-#Display 'XWindow'
+Display 'XWindow'
#Display 'USBLCD'
#Display 'BWCT'
#Display 'Image'
@@ -945,12 +945,12 @@ Display 'CF633'
#Display 'LPH7508-serdisplib'
#Display 'LPH7508'
-#Layout 'Default'
+Layout 'Default'
#Layout 'L8x2'
#Layout 'L16x2'
#Layout 'L20x2'
#Layout 'Test'
#Layout 'Test2'
-Layout 'TestGPO'
+#Layout 'TestGPO'
diff --git a/plugin_mysql.c b/plugin_mysql.c
index fd35e11..1ccdb0e 100644
--- a/plugin_mysql.c
+++ b/plugin_mysql.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_mysql.c,v 1.9 2006/01/20 15:43:25 reinelt Exp $
+/* $Id: plugin_mysql.c,v 1.10 2006/01/20 15:58:05 reinelt Exp $
*
* plugin for execute SQL queries into a MySQL DBSM.
*
@@ -23,6 +23,9 @@
*
*
* $Log: plugin_mysql.c,v $
+ * Revision 1.10 2006/01/20 15:58:05 reinelt
+ * MySQL::count() added again
+ *
* Revision 1.9 2006/01/20 15:43:25 reinelt
* MySQL::query() returns a value, not the number of rows
*
@@ -162,9 +165,7 @@ static int configure_mysql(void)
return configured;
}
-#if 0
-/* removed because you can use 'query("select count(*)")' */
-static void my_MySQLquery(RESULT * result, RESULT * query)
+static void my_MySQLcount(RESULT * result, RESULT * query)
{
char *q;
double value;
@@ -195,7 +196,6 @@ static void my_MySQLquery(RESULT * result, RESULT * query)
SetResult(&result, R_NUMBER, &value);
}
-#endif
static void my_MySQLquery(RESULT * result, RESULT * query)
@@ -259,6 +259,7 @@ static void my_MySQLstatus(RESULT * result)
int plugin_init_mysql(void)
{
#ifdef HAVE_MYSQL_MYSQL_H
+ AddFunction("MySQL::count", 1, my_MySQLcount);
AddFunction("MySQL::query", 1, my_MySQLquery);
AddFunction("MySQL::status", 0, my_MySQLstatus);
#endif
n class='deletions'>-2667/+38002 2016-01-18Release 0+git20151202.3864e0a-1debian/0+git20151202.3864e0a-1Jonathan McCrohan1-2/+3 2016-01-18Imported Upstream version 0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2016-01-18Update get-vcs-snapshot.sh to reflect gbp changesJonathan McCrohan2-1/+2 2016-01-18Imported Upstream version 0+git20151202.3864e0aupstream/0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2015-05-05d/control: various fixes found by libconfig-model-dpkg-perlJonathan McCrohan2-5/+13 2015-04-01Release 0+git20150208.f2053b3-1Jonathan McCrohan1-2/+2 2015-04-01Describe changes made in snapshotJonathan McCrohan1-0/+3 2015-04-01New Upstream Snapshot (commit f2053b3)Jonathan McCrohan1-0/+6 2015-04-01Imported Upstream version 0+git20150208.f2053b3upstream/0+git20150208.f2053b3Jonathan McCrohan32-333/+483 2014-12-28Release 0+git20141218.b46a22c-1debian/0+git20141218.b46a22c-1Jonathan McCrohan1-2/+2 2014-12-28Updated AU DVB-T files; Thanks Brian Burch! (Closes LP: #1393280)Jonathan McCrohan1-0/+1 2014-12-28New Upstream Snapshot (commit b46a22c)Jonathan McCrohan1-0/+6 2014-12-28Imported Upstream version 0+git20141218.b46a22cupstream/0+git20141218.b46a22cJonathan McCrohan535-639/+317 2014-10-20Release 0+git20141009.d26b627-1debian/0+git20141009.d26b627-1Jonathan McCrohan1-2/+2 2014-10-20Fix up packaging to account for move to DVBv5Jonathan McCrohan2-2/+6 2014-10-20delete d/dtv-scan-files.install; Upstream now supplies a MakefileJonathan McCrohan2-4/+1 2014-10-15d/control: update Standards Version to 3.9.6Jonathan McCrohan2-1/+3 2014-10-15d/control: add Build-Depends on dvb-toolsJonathan McCrohan2-1/+2 2014-10-15New Upstream Snapshot (commit d26b627)Jonathan McCrohan1-0/+10 2014-10-15Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627Jonathan McCrohan2010-11120/+159271 2014-07-23Release 0+git20140611.14bd6c7-1debian/0+git20140611.14bd6c7-1Jonathan McCrohan1-2/+2 2014-07-23New Upstream Snapshot (commit 14bd6c7)Jonathan McCrohan1-2/+3 2014-07-23Imported Upstream version 0+git20140611.14bd6c7upstream/0+git20140611.14bd6c7Jonathan McCrohan7-11/+60 2014-05-13New Upstream Snapshot (commit 1246b27)Jonathan McCrohan1-0/+6 2014-05-13Imported Upstream version 0+git20140512.1246b27upstream/0+git20140512.1246b27Jonathan McCrohan391-301/+3983 2014-04-05Release 0+git20140326.cfc2975-1debian/0+git20140326.cfc2975-1Jonathan McCrohan1-2/+2 2014-04-05d/control: update Homepage (upstream has moved from Gitweb to cgit)Jonathan McCrohan2-1/+2 2014-04-05New Upstream Snapshot (commit cfc2975)Jonathan McCrohan1-0/+6 2014-04-05Imported Upstream version 0+git20140326.cfc2975upstream/0+git20140326.cfc2975Jonathan McCrohan118-656/+877 2014-01-16Release 0+git20140107.1850cf8-1debian/0+git20140107.1850cf8-1Jonathan McCrohan1-2/+2 2014-01-16Update Standards Version to 3.9.5Jonathan McCrohan2-1/+9 No changes required