[PATCH 4/7] Add buddy support to Cobalt DB import

Miika Turkia miika.turkia at gmail.com
Sat Dec 20 08:19:46 PST 2014


Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 parse-xml.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/parse-xml.c b/parse-xml.c
index d799850..d5496aa 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2358,6 +2358,14 @@ extern int cobalt_cylinders(void *handle, int columns, char **data, char **colum
 	return 0;
 }
 
+extern int cobalt_buddies(void *handle, int columns, char **data, char **column)
+{
+	if (data[0])
+		utf8_string(data[0], &cur_dive->buddy);
+
+	return 0;
+}
+
 
 extern int cobalt_dive(void *param, int columns, char **data, char **column)
 {
@@ -2366,6 +2374,7 @@ extern int cobalt_dive(void *param, int columns, char **data, char **column)
 	char *err = NULL;
 	char get_profile_template[] = "select runtime*60,(DepthPressure*10000/SurfacePressure)-10000,p.Temperature from Dive AS d JOIN TrackPoints AS p ON d.Id=p.DiveId where d.Id=%d";
 	char get_cylinder_template[] = "select FO2,FHe,StartingPressure,EndingPressure,TankSize,TankPressure,TotalConsumption from GasMixes where DiveID=%d and StartingPressure>0 group by FO2,FHe";
+	char get_buddy_template[] = "select l.Data from Items AS i, List AS l ON i.Value1=l.Id where i.DiveId=%d and l.Type=4";
 	char get_buffer[1024];
 
 	dive_start();
@@ -2416,6 +2425,13 @@ extern int cobalt_dive(void *param, int columns, char **data, char **column)
 		return 1;
 	}
 
+	snprintf(get_buffer, sizeof(get_buffer) - 1, get_buddy_template, cur_dive->number);
+	retval = sqlite3_exec(handle, get_buffer, &cobalt_buddies, 0, &err);
+	if (retval != SQLITE_OK) {
+		fprintf(stderr, "%s", translate("gettextFromC", "Database query get_cylinders failed.\n"));
+		return 1;
+	}
+
 	snprintf(get_buffer, sizeof(get_buffer) - 1, get_profile_template, cur_dive->number);
 	retval = sqlite3_exec(handle, get_buffer, &cobalt_profile_sample, 0, &err);
 	if (retval != SQLITE_OK) {
-- 
1.9.1



More information about the subsurface mailing list