[chronojump] Fixed potentially bugs on SqliteEncoder.Select
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed potentially bugs on SqliteEncoder.Select
- Date: Tue, 20 Apr 2021 11:42:01 +0000 (UTC)
commit 6bb4c097112a37026c087310f9a48a7e06281c6d
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Apr 20 13:40:41 2021 +0200
Fixed potentially bugs on SqliteEncoder.Select
src/sqlite/encoder.cs | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/src/sqlite/encoder.cs b/src/sqlite/encoder.cs
index 6e92e4a8..37b5b639 100644
--- a/src/sqlite/encoder.cs
+++ b/src/sqlite/encoder.cs
@@ -214,21 +214,30 @@ class SqliteEncoder : Sqlite
if(! dbconOpened)
Sqlite.Open();
+ string andString = "";
string personIDStr = "";
- if(personID != -1)
- personIDStr = " personID = " + personID + " AND ";
+ if(personID != -1) {
+ personIDStr = " personID = " + personID;
+ andString = " AND ";
+ }
string sessionIDStr = "";
- if(sessionID != -1)
- sessionIDStr = " sessionID = " + sessionID + " AND ";
+ if(sessionID != -1) {
+ sessionIDStr = andString + " sessionID = " + sessionID;
+ andString = " AND ";
+ }
string exerciseIDStr = "";
- if(exerciseID != -1)
- exerciseIDStr = " exerciseID = " + exerciseID + " AND ";
+ if(exerciseID != -1) {
+ exerciseIDStr = andString + " exerciseID = " + exerciseID;
+ andString = " AND ";
+ }
string lateralityEnglishStr = "";
- if(lateralityEnglish != "")
- lateralityEnglishStr = " laterality = \"" + lateralityEnglish + "\" AND ";
+ if(lateralityEnglish != "") {
+ lateralityEnglishStr = andString + " laterality = \"" + lateralityEnglish + "\"";
+ andString = " AND ";
+ }
string selectStr = "";
if(uniqueID != -1)
@@ -237,20 +246,15 @@ class SqliteEncoder : Sqlite
if(signalOrCurve == "all")
selectStr = personIDStr + sessionIDStr + exerciseIDStr + lateralityEnglishStr;
else
- selectStr = personIDStr + sessionIDStr + exerciseIDStr + lateralityEnglishStr
+ " signalOrCurve = \"" + signalOrCurve + "\"";
+ selectStr = personIDStr + sessionIDStr + exerciseIDStr + lateralityEnglishStr
+ andString + " signalOrCurve = \"" + signalOrCurve + "\"";
if(ecconSelect != EncoderSQL.Eccons.ALL)
- selectStr += " AND " + Constants.EncoderTable + ".eccon = \"" +
EncoderSQL.Eccons.ecS.ToString() + "\"";
+ selectStr += andString + Constants.EncoderTable + ".eccon = \"" +
EncoderSQL.Eccons.ecS.ToString() + "\"";
}
-
- string andString = "";
- if(selectStr != "")
- andString = " AND ";
-
string onlyActiveString = "";
if(onlyActive)
- onlyActiveString = " AND " + Constants.EncoderTable + ".status = \"active\" ";
+ onlyActiveString = andString + Constants.EncoderTable + ".status = \"active\" ";
string orderIDstr = "";
if(! orderIDascendent)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]