From: hades Date: Mon, 21 Aug 2000 16:31:42 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5c57130fba13779bb920656835b2ebb364214519;p=daqdata.git *** empty log message *** --- diff --git a/allParam/psql/psqlParam.c b/allParam/psql/psqlParam.c index 8b3b7ba..75e71e6 100644 --- a/allParam/psql/psqlParam.c +++ b/allParam/psql/psqlParam.c @@ -40,7 +40,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma *rows = 0; conn = PQconnectdb("host=casino dbname=bsailer user=bsailer"); sprintf(whereClause, "WHERE name = \'%s\' AND idx = \'%s\' ORDER BY seq_num", name, idx); - sprintf(query, "SELECT * FROM vme_cpus %s UNION SELECT * FROM vme_setup %s UNION SELECT * FROM crate_params %s UNION SELECT * FROM card_params %s;", whereClause, whereClause, whereClause, whereClause); + sprintf(query, "SELECT * FROM card_params %s UNION SELECT * FROM cpus %s UNION SELECT * FROM crate_params %s UNION SELECT * FROM crate_setup %s;", whereClause, whereClause, whereClause, whereClause); result = PQexec(conn, query); if(PQresultStatus(result) != PGRES_TUPLES_OK) { @@ -89,7 +89,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int *rows = 0; conn = PQconnectdb("host=casino dbname=bsailer user=bsailer"); sprintf(whereClause, "WHERE name = \'%s\' AND idx = \'%s\' ORDER BY seq_num", name, idx); - sprintf(query, "SELECT * FROM vme_cpus %s UNION SELECT * FROM vme_setup %s UNION SELECT * FROM crate_params %s UNION SELECT * FROM card_params %s;", whereClause, whereClause, whereClause, whereClause); + sprintf(query, "SELECT * FROM card_params %s UNION SELECT * FROM cpus %s UNION SELECT * FROM crate_params %s UNION SELECT * FROM crate_setup %s;", whereClause, whereClause, whereClause, whereClause); result = PQexec(conn, query); if(PQresultStatus(result) != PGRES_TUPLES_OK) {