Commit 4f24176f6a04112db2e680ca3136ecb4940ba68f

Terry Ross
Fri Dec 26 06:03:29 CET 2008

Tree SHA1: 0e63537
Parent SHA1: 0b24f27 (Major mod to SignOnTime.)
raw diff | raw patch

Modified SignOnTime, and changed Status to use it.

Diff rendering mode:
inline
side by side


67	67	minuteadjust : BOOLEAN;
68	68
69	69	BEGIN
	70	string := "I signed on at ";
	71	(*
70	72	Strings.Concat(parse.nick, ", I signed on at ", string);
	73	*)
71	74	(* Hour *)
72	75	WholeStr.CardToStr(Timers.signOnTime.hour, temp);
73	76	IF LENGTH(temp)=1 THEN
…	…
118	118	WholeStr.CardToStr(Timers.signOnTime.year, temp);
119	119	Strings.Concat(string, temp, string);
120	120	Strings.Concat(string, ".", string);
	121	(*
121	122	Message.PrintLine(parse.chan, string);
122
123		(* Show elapsed time *)
	123	*)
	124
	125	(* show elapsed time *)
124	126	elapsed.startTime := Timers.signOnSeconds;
125	127	elapsed.endTime := TimeConv.time();
126	128
127	129	TimeFunc.elapsedTime(elapsed);
128	130	IF elapsed.valid THEN
129		string := "That is: ";
	131	Strings.Concat(string, " (", string);
130	132	IF elapsed.weeks > 0 THEN
131		FormStr.append(string, "%d weeks, ", elapsed.weeks);
	133	IF elapsed.weeks = 1 THEN
	134	FormStr.append(string, "%d week, ", elapsed.weeks);
	135	ELSE
	136	FormStr.append(string, "%d weeks, ", elapsed.weeks);
	137	END;
132	138	END;
133	139	IF elapsed.days > 0 THEN
134		FormStr.append(string, "%d days, ", elapsed.days);
	140	IF elapsed.days = 1 THEN
	141	FormStr.append(string, "%d day, ", elapsed.days);
	142	ELSE
	143	FormStr.append(string, "%d days, ", elapsed.days);
	144	END;
135	145	END;
136	146	IF elapsed.hours > 0 THEN
137		FormStr.append(string, "%d hours, ", elapsed.hours);
	147	IF elapsed.hours = 1 THEN
	148	FormStr.append(string, "%d hour, ", elapsed.hours);
	149	ELSE
	150	FormStr.append(string, "%d hours, ", elapsed.hours);
	151	END;
138	152	END;
139	153	IF elapsed.minutes > 0 THEN
140		FormStr.append(string, "%d minutes and ", elapsed.minutes);
	154	IF elapsed.minutes = 1 THEN
	155	FormStr.append(string, "%d minute and ", elapsed.minutes);
	156	ELSE
	157	FormStr.append(string, "%d minutes and ", elapsed.minutes);
	158	END;
141	159	END;
142		FormStr.append(string, "%d seconds.", elapsed.seconds);
	160	IF elapsed.seconds = 1 THEN
	161	FormStr.append(string, "%d second", elapsed.seconds);
	162	ELSE
	163	FormStr.append(string, "%d seconds", elapsed.seconds);
	164	END;
	165	Strings.Concat(string, " ago).", string);
143	166	END;
144	167	Message.PrintLine(parse.chan, string);
145	168
146	169	EXCEPT
147	170
148		Message.PrintLine(parse.chan, "qnr: I've encountered an exception in SignOnTime");
	171	Message.PrintLine(parse.chan, "qnr: i've encountered an exception in signontime");
149	172	IF M2EXCEPTION.IsM2Exception() THEN
150	173	END;
151		RETURN; (* Temporarily ignore the exception ) ( well, that didn't work *)
	174	RETURN; (* temporarily ignore the exception ) ( well, that didn't work *)
152	175
153	176	END SignOnTime;
154	177
…	…
179	179	(**************************************************)
180	180	PROCEDURE SleepIB(parse : Message.Parse);
181	181	CONST
182		fibPasswd = "/home/terry/p6dat/dat/ibPasswd";
	182	fibPasswd = "/home/terry/p6dat/dat/ibpasswd";
183	183	VAR
184	184	str, password : Message.strType;
185	185	file : StreamFile.ChanId;
…	…
356	356	startSeconds, nowSeconds, trueSeconds: CARDINAL;
357	357
358	358	BEGIN
	359	SignOnTime(parse);
	360	(*
359	361	soTime := Timers.signOnTime;
360	362	(* do the time bit *)
361	363	SysClock.GetClock(nowTime);
…	…
418	418	ELSE
419	419	Strings.Concat(string, " seconds. ", string);
420	420	END;
421
	421	*)
422	422	WholeStr.CardToStr(Message.linesSent, sent);
423	423	WholeStr.CardToStr(Message.linesRead, read);
424	424

Commit 4f24176f6a04112db2e680ca3136ecb4940ba68f

Gitorious