X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcsv.c;h=78037a940ca3981a150a3fa84055c490b83c955b;hb=b8f83ce0a28e0d8033c0f3bdc95aeb44a2d17381;hp=5c43b8a87421b312216281aa4562fe47b11d7703;hpb=34e095d9e7c605ded713203f21e4f00c8d6b6d44;p=collectd.git

diff --git a/src/csv.c b/src/csv.c
index 5c43b8a8..78037a94 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -61,37 +61,50 @@ static int value_list_to_string (char *buffer, int buffer_len,
 	for (i = 0; i < ds->ds_num; i++)
 	{
 		if ((ds->ds[i].type != DS_TYPE_COUNTER)
-				&& (ds->ds[i].type != DS_TYPE_GAUGE))
+				&& (ds->ds[i].type != DS_TYPE_GAUGE)
+				&& (ds->ds[i].type != DS_TYPE_DERIVE)
+				&& (ds->ds[i].type != DS_TYPE_ABSOLUTE))
 			return (-1);
 
-		if (ds->ds[i].type == DS_TYPE_COUNTER)
+		if (ds->ds[i].type == DS_TYPE_GAUGE) 
 		{
-			if (store_rates == 0)
-			{
-				status = ssnprintf (buffer + offset,
-						buffer_len - offset,
-						",%llu",
-						vl->values[i].counter);
-			}
-			else /* if (store_rates == 1) */
+			status = ssnprintf (buffer + offset, buffer_len - offset,
+					",%lf", vl->values[i].gauge);
+		} 
+		else if (store_rates != 0)
+		{
+			if (rates == NULL)
+				rates = uc_get_rate (ds, vl);
+			if (rates == NULL)
 			{
-				if (rates == NULL)
-					rates = uc_get_rate (ds, vl);
-				if (rates == NULL)
-				{
-					WARNING ("csv plugin: "
-							"uc_get_rate failed.");
-					return (-1);
-				}
-				status = ssnprintf (buffer + offset,
-						buffer_len - offset,
-						",%lf", rates[i]);
+				WARNING ("csv plugin: "
+						"uc_get_rate failed.");
+				return (-1);
 			}
+			status = ssnprintf (buffer + offset,
+					buffer_len - offset,
+					",%lf", rates[i]);
 		}
-		else /* if (ds->ds[i].type == DS_TYPE_GAUGE) */
+		else if (ds->ds[i].type == DS_TYPE_COUNTER)
 		{
-			status = ssnprintf (buffer + offset, buffer_len - offset,
-					",%lf", vl->values[i].gauge);
+			status = ssnprintf (buffer + offset,
+					buffer_len - offset,
+					",%llu",
+					vl->values[i].counter);
+		}
+		else if (ds->ds[i].type == DS_TYPE_DERIVE)
+		{
+			status = ssnprintf (buffer + offset,
+					buffer_len - offset,
+					",%"PRIi64,
+					vl->values[i].derive);
+		}
+		else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
+		{
+			status = ssnprintf (buffer + offset,
+					buffer_len - offset,
+					",%"PRIu64,
+					vl->values[i].absolute);
 		}
 
 		if ((status < 1) || (status >= (buffer_len - offset)))