From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 9 Sep 2013 13:54:19 +0000 (+0200)
Subject: ido: Fix timeperiods with more than one segment.
X-Git-Tag: v0.0.3~587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf3298f130a5a50cda4fd7401e366e70a65629e3;p=icinga2

ido: Fix timeperiods with more than one segment.
---

diff --git a/lib/ido/timeperioddbobject.cpp b/lib/ido/timeperioddbobject.cpp
index 28f9f9d44..9037305ea 100644
--- a/lib/ido/timeperioddbobject.cpp
+++ b/lib/ido/timeperioddbobject.cpp
@@ -97,18 +97,24 @@ void TimePeriodDbObject::OnConfigUpdate(void)
 		}
 #endif /* _MSC_VER */
 
-		tm begin, end;
-		LegacyTimePeriod::ProcessTimeRangeRaw(value, &reference, &begin, &end);
-
-		DbQuery query;
-		query.Table = GetType()->GetTable() + "_timeranges";
-		query.Type = DbQueryInsert;
-		query.Fields = boost::make_shared<Dictionary>();
-		query.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
-		query.Fields->Set("timeperiod_id", DbValue::FromObjectInsertID(tp));
-		query.Fields->Set("day", wday);
-		query.Fields->Set("start_sec", begin.tm_hour * 3600 + begin.tm_min * 60 + begin.tm_sec);
-		query.Fields->Set("end_sec", end.tm_hour * 3600 + end.tm_min * 60 + end.tm_sec);
-		OnQuery(query);
+		Array::Ptr segments = boost::make_shared<Array>();
+		LegacyTimePeriod::ProcessTimeRanges(value, &reference, segments);
+
+		BOOST_FOREACH(const Value& vsegment, segments) {
+			Dictionary::Ptr segment = vsegment;
+			int begin = segment->Get("begin");
+			int end = segment->Get("end");
+
+			DbQuery query;
+			query.Table = GetType()->GetTable() + "_timeranges";
+			query.Type = DbQueryInsert;
+			query.Fields = boost::make_shared<Dictionary>();
+			query.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
+			query.Fields->Set("timeperiod_id", DbValue::FromObjectInsertID(tp));
+			query.Fields->Set("day", wday);
+			query.Fields->Set("start_sec", begin % 86400);
+			query.Fields->Set("end_sec", end % 86400);
+			OnQuery(query);
+		}
 	}
 }