1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
subsurface/core
Jim Wobser 89c6015cde Handle Mulitple Seac Computers colliding during import
The Seac importer was getting samples based only on dive number,
which was causing samples from different computers but with the
same dive number to become interleaved.

To correct this, the SQL statement was updated to use the
dive_id to query for samples. The table schema uses dive_id
as a primary key, which will enforce uniqueness.

Additionally, deviceid is hashed from the the device_id string.

Reported-by: David Brebera <david.brebera@gmail.com>
Signed-off-by: Jim Wobser <james.wobser@gmail.com>
2022-05-12 11:07:03 -07:00
..
settings cleanup: replace deprecated methods 2022-03-12 08:28:32 -08:00
subsurface-qt Allow editing sensors through equipment tab 2022-03-12 11:24:50 -08:00
android.cpp core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
btdiscovery.cpp Qt6: Bluetooth API changes 2022-03-12 08:28:32 -08:00
btdiscovery.h
checkcloudconnection.cpp Collect and convert git repo data to 'struct git_info' 2022-04-17 22:14:34 -07:00
checkcloudconnection.h cloudstorage: try alternative server if first connection fails 2021-04-19 12:51:01 -07:00
cloudstorage.cpp Qt6: update the connect calls for QNetworkReply 2022-04-18 07:24:39 +02:00
cloudstorage.h
CMakeLists.txt core: add class that collects global objects to be deleted on exit 2022-03-16 13:06:06 -07:00
cochran.c cleanup: split out divecomputer functions from dive.c 2020-10-25 13:59:52 -07:00
cochran.h Cochran import: better support for older models 2017-05-31 21:53:00 -07:00
color.cpp profile: rename GF_LINE color to DURATION_LINE 2021-05-08 13:40:24 +02:00
color.h cleanup: prevent distracing conversion warnings 2022-03-12 08:28:32 -08:00
compressibility.r
configuredivecomputer.cpp
configuredivecomputer.h
configuredivecomputerthreads.cpp
configuredivecomputerthreads.h
connectionlistmodel.cpp
connectionlistmodel.h
datatrak.c cleanup: pass all parameters to weightsystem_t 2022-01-02 13:51:07 -08:00
datatrak.h Cleanup: const-ify functions taking dives and divecomputers 2018-08-23 14:41:01 -07:00
deco.c planner: pass in_planner argument to decoMode() 2021-02-17 07:26:55 -08:00
deco.h planner: pass in_planner argument to decoMode() 2021-02-17 07:26:55 -08:00
device.cpp cleanup: remove obsolete includes in core/device.cpp 2022-01-02 13:51:07 -08:00
device.h core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
devicedetails.cpp
devicedetails.h
dive.c core: fix detection of used cylinders 2022-04-28 12:30:10 -07:00
dive.h core: remove current_dc macro 2022-03-13 15:07:33 -07:00
divecomputer.c core: add a function to test for sensors of a given cylinder 2021-09-03 13:35:28 -07:00
divecomputer.h Clean up divecomputer 'device' handling 2021-08-18 13:22:02 -07:00
divefilter.cpp build-system: make map support its own thing 2022-04-18 07:24:38 +02:00
divefilter.h
divelist.c Don't attempt to compute SAC for CCR dives 2021-11-24 11:03:51 -08:00
divelist.h core: move has_dive helper function 2021-10-30 20:22:52 -07:00
divelogexportlogic.cpp
divelogexportlogic.h
divemode.h
divesite-helper.cpp
divesite.c core: avoid crash when reading corrupted git data 2022-02-28 14:31:19 -08:00
divesite.h
divesitehelpers.cpp cleanup: replace QRegExp with QRegularExpression 2021-10-27 12:33:20 -07:00
divesitehelpers.h
downloadfromdcthread.cpp Re-do the libdivecomputer fingerprint save/load code 2021-09-19 16:51:46 -07:00
downloadfromdcthread.h Re-do the libdivecomputer fingerprint save/load code 2021-09-19 16:51:46 -07:00
equipment.c core: fold display.h into profile.h 2022-03-13 15:07:33 -07:00
equipment.h cylinders: add cylinder before hidden cylinders 2021-12-13 11:54:24 -08:00
errorhelper.c
errorhelper.h
event.c cleanup: break out event-related code into event.[c|h] 2020-10-25 13:59:52 -07:00
event.h cleanup: break out event-related code into event.[c|h] 2020-10-25 13:59:52 -07:00
exif.cpp
exif.h
extradata.h cleanup: split out divecomputer functions from dive.c 2020-10-25 13:59:52 -07:00
file.c git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
file.h
filterconstraint.cpp core: replace dive master by dive guide 2022-02-15 09:35:43 -08:00
filterconstraint.h
filterpreset.cpp
filterpreset.h
format.cpp core: C++-ify membuffer 2021-07-23 11:22:43 -07:00
format.h Cleanup: Move *_loc formatting functions into new format.cpp file 2018-04-09 11:29:43 -07:00
fulltext.cpp core: replace dive master by dive guide 2022-02-15 09:35:43 -08:00
fulltext.h fulltext: remember original query 2020-09-29 16:13:03 -07:00
gas-model.c Don't access gasmix.o2.fraction 2021-10-01 08:50:36 -07:00
gas.c cleanup: fix narrowing type conversion warning 2022-01-02 13:51:07 -08:00
gas.h Don't access gasmix.o2.fraction 2021-10-01 08:50:36 -07:00
gaspressures.c core: fold display.h into profile.h 2022-03-13 15:07:33 -07:00
gaspressures.h
gettext.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gettextfromc.cpp
gettextfromc.h
git-access.c git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
git-access.h git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
globals.cpp core: add class that collects global objects to be deleted on exit 2022-03-16 13:06:06 -07:00
globals.h core: add class that collects global objects to be deleted on exit 2022-03-16 13:06:06 -07:00
imagedownloader.cpp
imagedownloader.h
import-cobalt.c
import-csv.c cleanup: make a variable signed 2022-01-02 13:51:07 -08:00
import-csv.h
import-divinglog.c core: replace dive master by dive guide 2022-02-15 09:35:43 -08:00
import-seac.c Handle Mulitple Seac Computers colliding during import 2022-05-12 11:07:03 -07:00
import-shearwater.c
import-suunto.c DM5 import: Add dive mode support (OC and CCR) 2022-01-31 09:35:21 -08:00
interpolate.h
ios.cpp core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
libdivecomputer.c core: work around water temperature bug in Tecdiving DiveComputer.eu 2022-04-13 14:29:10 -07:00
libdivecomputer.h Re-do the libdivecomputer fingerprint save/load code 2021-09-19 16:51:46 -07:00
liquivision.c Maintain sensor index for uemis and liquivision 2022-03-12 11:26:00 -08:00
load-git.c git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
macos.c core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
membuffer.cpp core: C++-ify membuffer 2021-07-23 11:22:43 -07:00
membuffer.h core: C++-ify membuffer 2021-07-23 11:22:43 -07:00
metadata.cpp cleanup: fix SkipEmptyParts warning for mobile 2021-11-24 10:53:26 -08:00
metadata.h Add 'location_t' data structure 2018-10-21 19:55:09 +03:00
metrics.cpp core: remove DPR from IconMetrics class 2021-12-17 11:54:23 -08:00
metrics.h core: remove DPR from IconMetrics class 2021-12-17 11:54:23 -08:00
namecmp.h Qt6: deal with changes from QStringRef to QStringView 2022-03-12 08:28:32 -08:00
ostctools.c
parse-gpx.cpp Qt6: deal with changes from QStringRef to QStringView 2022-03-12 08:28:32 -08:00
parse-gpx.h cleanup: only include QString in desktop-widgets/importgps.h 2020-05-01 09:42:31 -07:00
parse-xml.c core: replace dive master by dive guide 2022-02-15 09:35:43 -08:00
parse.c core: load and save fingerprints to XML 2021-11-12 12:45:22 -08:00
parse.h core: load and save fingerprints to XML 2021-11-12 12:45:22 -08:00
picture.c
picture.h core: move picture-related function from dive.c to picture.c 2020-05-06 13:58:09 -07:00
pictureobj.cpp
pictureobj.h
planner.c Planner: Correctly compute CNS and OTU for bailout segments 2021-08-19 10:58:08 -07:00
planner.h
plannernotes.c planner: pass in_planner argument to decoMode() 2021-02-17 07:26:55 -08:00
pref.c core: remove location service preferences 2021-09-13 11:21:34 -07:00
pref.h core: remove location service preferences 2021-09-13 11:21:34 -07:00
profile.c Use 10ft as deco step size in imperial units in profile 2022-05-06 14:17:29 -07:00
profile.h core: fold display.h into profile.h 2022-03-13 15:07:33 -07:00
qt-ble.cpp Qt6: use the newer createCentral() API 2022-03-12 08:28:32 -08:00
qt-ble.h Qt6: Bluetooth API changes 2022-03-12 08:28:32 -08:00
qt-gui.h mobile/UI: remember the system default font size 2021-01-19 12:35:29 -08:00
qt-init.cpp translations: fix Portuguese parent translation 2022-03-27 17:11:05 -07:00
qthelper.cpp core: allow separators ,; after degree-style coord 2022-03-27 16:37:10 -07:00
qthelper.h Collect and convert git repo data to 'struct git_info' 2022-04-17 22:14:34 -07:00
qtserialbluetooth.cpp Use QtBluetooth enums from their namespace 2021-03-12 08:41:31 -08:00
sample.c cleanup: split out divecomputer functions from dive.c 2020-10-25 13:59:52 -07:00
sample.h core: use int16_t for sensor-id 2021-07-23 11:16:00 -07:00
save-git.c git access: save to local repository before doing remote access 2022-04-22 08:28:17 -07:00
save-html.c core: replace dive master by dive guide 2022-02-15 09:35:43 -08:00
save-html.h
save-profiledata.c core: fold display.h into profile.h 2022-03-13 15:07:33 -07:00
save-profiledata.h
save-xml.c git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
selection.cpp
selection.h
serial_ftdi.c
serial_usb_android.cpp
serial_usb_android.h
sha1.c Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
sha1.h
ssrf.h
statistics.c core: fold display.h into profile.h 2022-03-13 15:07:33 -07:00
statistics.h
string-format.cpp formatting: move get_trip_title to string-format.h and split it 2021-12-17 10:36:13 -08:00
string-format.h formatting: move get_trip_title to string-format.h and split it 2021-12-17 10:36:13 -08:00
strndup.h
strtod.c Core: introduce new subsurface-string header 2018-05-14 10:13:39 -07:00
structured_list.h
subsurface-string.h
subsurface-time.h
subsurfacestartup.c git access: add proper cleanup function for git_info 2022-04-22 08:28:17 -07:00
subsurfacestartup.h
subsurfacesysinfo.cpp
subsurfacesysinfo.h
table.h media: create sort_picture_table function via macro 2020-05-06 13:58:09 -07:00
tag.c
tag.h
taxonomy.c
taxonomy.h cleanup: make taxonomy_index_for_category() local to taxonomy.c 2020-09-06 12:59:54 -07:00
time.c cleanup: const-ify utc_mktime() 2020-12-29 08:34:09 -08:00
timer.c Add timestamps to libdivecomputer.log 2020-03-10 17:42:54 -07:00
timer.h
trip.c cleanup: fix over-eager Coverity warnings 2020-10-25 13:58:03 -07:00
trip.h selection: add selection flag for trips 2020-05-03 15:02:21 -07:00
uemis-downloader.c bugfix: call fprintf() instead of printf() 2022-02-15 14:26:43 -08:00
uemis.c Maintain sensor index for uemis and liquivision 2022-03-12 11:26:00 -08:00
uemis.h Dive site: use pointer instead of uuid in uemis_helper 2018-10-29 00:09:31 +00:00
units.c core: return floating point from to_PSI() functions 2021-12-17 11:54:23 -08:00
units.h cleanup: make feet_to_mm signed 2022-01-02 13:51:07 -08:00
unix.c core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
uploadDiveLogsDE.cpp Qt6: update the connect calls for QNetworkReply 2022-04-18 07:24:39 +02:00
uploadDiveLogsDE.h export: clean up temp file after divelogs.de upload 2021-08-06 11:05:06 -07:00
uploadDiveShare.cpp Qt6: update the connect calls for QNetworkReply 2022-04-18 07:24:39 +02:00
uploadDiveShare.h
version.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
version.h Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
videoframeextractor.cpp
videoframeextractor.h
webservice.h
windows.c core: move device related functions from display.h to device.h 2022-03-13 15:07:33 -07:00
windowtitleupdate.cpp
windowtitleupdate.h
worldmap-options.h
worldmap-save.c
worldmap-save.h
xmlparams.cpp
xmlparams.h
xmp_parser.cpp
xmp_parser.h