Skip to content

v.49 fix database key groundspeed -> speed #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2017
Merged

v.49 fix database key groundspeed -> speed #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import java.text.SimpleDateFormat
jobName = "metadata-exporter"
version = "0.1.48"
version = "0.1.49"
build_dir = "build"
buildPackageName = "meta-exporter"

Expand All @@ -9,12 +9,12 @@ node ('dockerslave') {
deleteDir()
stage ('Git') {
git branch: 'master', url: 'git@github.com:MONROE-PROJECT/Utilities.git'
checkout([$class: 'GitSCM',
branches: [[name: 'master']],
doGenerateSubmoduleConfigurations: false,
extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']],
submoduleCfg: [],

checkout([$class: 'GitSCM',
branches: [[name: 'master']],
doGenerateSubmoduleConfigurations: false,
extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']],
submoduleCfg: [],
userRemoteConfigs: [[url: 'git@github.com:kristrev/data-exporter.git']]])
gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
shortCommit = gitCommit.take(6)
Expand Down Expand Up @@ -57,7 +57,7 @@ node ('dockerslave') {
sh "rm meta-exporter*.deb"
}
}

stage ('Archive artifacts') {
archiveArtifacts "${build_dir}/*.deb"
}
Expand Down
6 changes: 3 additions & 3 deletions metadata_writer_sqlite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"Latitude REAL NOT NULL," \
"Longitude REAL NOT NULL," \
"Altitude REAL," \
"GroundSpeed REAL," \
"Speed REAL," \
"NumOfSatelites INTEGER," \
"PRIMARY KEY(NodeId) ON CONFLICT REPLACE)"

Expand Down Expand Up @@ -151,7 +151,7 @@
#define INSERT_GPS_EVENT "INSERT INTO GpsUpdate(NodeId,BootCount" \
",BootMultiplier,Timestamp" \
",Sequence,EventType,EventParam,Latitude,Longitude" \
",Altitude,GroundSpeed,NumOfSatelites) " \
",Altitude,Speed,NumOfSatelites) " \
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"

#define INSERT_MONITOR_EVENT "INSERT INTO MonitorEvents(NodeId,Timestamp" \
Expand Down Expand Up @@ -285,7 +285,7 @@
"quote(\"BootMultiplier\"), quote(\"Timestamp\"), "\
"quote(\"Sequence\"), quote(\"Latitude\"), "\
"quote(\"Longitude\"), quote(\"Altitude\"), "\
"quote(\"GroundSpeed\"), quote(\"NumOfSatelites\") "\
"quote(\"Speed\"), quote(\"NumOfSatelites\") "\
"|| \")\" FROM \"GpsUpdate\" ORDER BY Timestamp;"

#define DUMP_MONITOR "SELECT \"REPLACE INTO MonitorEvents" \
Expand Down