X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=file.c;h=3f06259faa1cd7087ef926e1cdd8a60b4d1bf9c1;hp=aff1d51f2d2c87b470f2b61b23d6c8b945870f73;hb=ba31e37063308ab74b282db983557797d05f59d1;hpb=80b0c097334a13f9fd69ed87eceb3997a1084311

diff --git a/file.c b/file.c
index aff1d51..3f06259 100644
--- a/file.c
+++ b/file.c
@@ -94,6 +94,125 @@ static int try_to_open_suunto(const char *filename, struct memblock *mem, GError
 	return success;
 }
 
+static time_t parse_date(const char *date)
+{
+	int hour, min, sec;
+	struct tm tm;
+	char *p;
+
+	memset(&tm, 0, sizeof(tm));
+	tm.tm_mday = strtol(date, &p, 10);
+	if (tm.tm_mday < 1 || tm.tm_mday > 31)
+		return 0;
+	for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
+		if (!memcmp(p, monthname(tm.tm_mon), 3))
+			break;
+	}
+	if (tm.tm_mon > 11)
+		return 0;
+	date = p+3;
+	tm.tm_year = strtol(date, &p, 10);
+	if (date == p)
+		return 0;
+	if (tm.tm_year < 70)
+		tm.tm_year += 2000;
+	if (tm.tm_year < 100)
+		tm.tm_year += 1900;
+	if (sscanf(p, "%d:%d:%d", &hour, &min, &sec) != 3)
+		return 0;
+	tm.tm_hour = hour;
+	tm.tm_min = min;
+	tm.tm_sec = sec;
+	return utc_mktime(&tm);
+}
+
+enum csv_format {
+	CSV_DEPTH, CSV_TEMP, CSV_PRESSURE
+};
+
+static void add_sample_data(struct sample *sample, enum csv_format type, double val)
+{
+	switch (type) {
+	case CSV_DEPTH:
+		sample->depth.mm = feet_to_mm(val);
+		break;
+	case CSV_TEMP:
+		sample->temperature.mkelvin = F_to_mkelvin(val);
+		break;
+	case CSV_PRESSURE:
+		sample->cylinderpressure.mbar = psi_to_mbar(val);
+		break;
+	}
+}
+
+/*
+ * Cochran comma-separated values: depth in feet, temperature in F, pressure in psi.
+ *
+ * They start with eight comma-separated fields like:
+ *
+ *   filename: {C:\Analyst4\can\T036785.can},{C:\Analyst4\can\K031892.can}
+ *   divenr: %d
+ *   datetime: {03Sep11 16:37:22},{15Dec11 18:27:02}
+ *   ??: 1
+ *   serialnr??: {CCI134},{CCI207}
+ *   computer??: {GeminiII},{CommanderIII}
+ *   computer??: {GeminiII},{CommanderIII}
+ *   ??: 1
+ *
+ * Followed by the data values (all comma-separated, all one long line).
+ */
+static int try_to_open_csv(const char *filename, struct memblock *mem, enum csv_format type)
+{
+	char *p = mem->buffer;
+	char *header[8];
+	int i, time;
+	time_t date;
+	struct dive *dive;
+
+	for (i = 0; i < 8; i++) {
+		header[i] = p;
+		p = strchr(p, ',');
+		if (!p)
+			return 0;
+		p++;
+	}
+
+	date = parse_date(header[2]);
+	if (!date)
+		return 0;
+
+	dive = alloc_dive();
+	dive->when = date;
+	dive->number = atoi(header[1]);
+
+	time = 0;
+	for (;;) {
+		char *end;
+		double val;
+		struct sample *sample;
+
+		errno = 0;
+		val = strtod(p,&end);
+		if (end == p)
+			break;
+		if (errno)
+			break;
+
+		sample = prepare_sample(&dive);
+		sample->time.seconds = time;
+		add_sample_data(sample, type, val);
+		finish_sample(dive);
+
+		time++;
+		dive->duration.seconds = time;
+		if (*end != ',')
+			break;
+		p = end+1;
+	}
+	record_dive(dive);
+	return 1;
+}
+
 static int open_by_filename(const char *filename, const char *fmt, struct memblock *mem, GError **error)
 {
 	/* Suunto Dive Manager files: SDE */
@@ -104,6 +223,14 @@ static int open_by_filename(const char *filename, const char *fmt, struct memblo
 	if (!strcasecmp(fmt, "CAN"))
 		return try_to_open_cochran(filename, mem, error);
 
+	/* Cochran export comma-separated-value files */
+	if (!strcasecmp(fmt, "DPT"))
+		return try_to_open_csv(filename, mem, CSV_DEPTH);
+	if (!strcasecmp(fmt, "TMP"))
+		return try_to_open_csv(filename, mem, CSV_TEMP);
+	if (!strcasecmp(fmt, "HP1"))
+		return try_to_open_csv(filename, mem, CSV_PRESSURE);
+
 	return 0;
 }