ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/DataAccess/Access_OUP_ADB.pas

Comparing oup/current/DataAccess/Access_OUP_ADB.pas (file contents):
Revision 109 by alloc, Wed Feb 21 03:12:33 2007 UTC vs.
Revision 112 by alloc, Thu Feb 22 00:37:39 2007 UTC

#	Line 261 | Line 261 | var
261		name := fields.Strings[2];
262		extension := fields.Strings[0];
263		end;
264	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
265	+	begin
266	+	id := fields.Strings[2];
267	+	name := fields.Strings[1];
268	+	extension := fields.Strings[0];
269	+	end;
270		end;
271
272		begin
#	Line 274 | Line 280 | begin
280		begin
281		if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
282		begin
283	<	if AppSettings.FilenumbersAsHex then
278	<	id := IntToHex(Fdat_files[i].ID, 4)
279	<	else
280	<	id := FormatNumber(Fdat_files[i].ID, 5, '0');
283	>	id := FormatNumber(Fdat_files[i].ID, 5, '0');
284		name := Fdat_files[i].Name;
285		extension := Fdat_files[i].Extension;
286
#	Line 285 | Line 288 | begin
288		ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
289		ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
290		ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
291	+	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
292		end;
293		end;
294		end;
#	Line 293 | Line 297 | begin
297		if list.Count > 0 then
298		begin
299		fields := TStringList.Create;
300	<	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc] then
300	>	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
301		for i := 0 to list.Count - 1 do
302		begin
303		getfields;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)