|
|
@ -280,8 +280,8 @@ calcNextRotate([OneSpec | Spec], NDate, NTime, NowDataTime) -> |
|
|
|
calcNextRotate(Spec, NDate, {NHour, SMinute, 0}, NowDataTime); |
|
|
|
_ -> |
|
|
|
%% rotation is next hour |
|
|
|
NexSec = utTime:lDateTimeToSec(NowDataTime) + 3600, |
|
|
|
{NNDate, NNTime} = utTime:secToLDateTime(NexSec), |
|
|
|
NexSec = rumTime:lDateTimeToSec(NowDataTime) + 3600, |
|
|
|
{NNDate, NNTime} = rumTime:secToLDateTime(NexSec), |
|
|
|
{NewHour, _, _} = NNTime, |
|
|
|
calcNextRotate(Spec, NNDate, {NewHour, SMinute, 0}, NowDataTime) |
|
|
|
end; |
|
|
@ -292,12 +292,12 @@ calcNextRotate([OneSpec | Spec], NDate, NTime, NowDataTime) -> |
|
|
|
calcNextRotate(Spec, NDate, {SHour, 0, 0}, NowDataTime); |
|
|
|
_ -> |
|
|
|
%% rotation is not today |
|
|
|
NexSec = utTime:lDateTimeToSec(NowDataTime) + 86400, |
|
|
|
{NNDate, _NNTime} = utTime:secToLDateTime(NexSec), |
|
|
|
NexSec = rumTime:lDateTimeToSec(NowDataTime) + 86400, |
|
|
|
{NNDate, _NNTime} = rumTime:secToLDateTime(NexSec), |
|
|
|
calcNextRotate(Spec, NNDate, {SHour, 0, 0}, NowDataTime) |
|
|
|
end; |
|
|
|
{day, SDay} -> |
|
|
|
CurDay = utTime:weekDay(NDate), |
|
|
|
CurDay = rumTime:weekDay(NDate), |
|
|
|
AdjustedDay = |
|
|
|
case SDay of |
|
|
|
0 -> 7; |
|
|
|