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 119 by alloc, Fri Mar 23 00:58:41 2007 UTC vs.
Revision 173 by alloc, Wed May 2 13:19:40 2007 UTC

#	Line 46 | Line 46 | type
46		implementation
47
48		uses
49	<	SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks;
49	>	SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks, StrUtils;
50
51
52		(*
#	Line 66 | Line 66 | begin
66		FFileName := DBFilename;
67
68		FDatabase := TABSDatabase.Create(nil);
69	+	FDatabase.Exclusive := True;
70	+	FDatabase.MultiUser := False;
71		FDatabase.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID);
72		FDatabase.DatabaseFileName := DBFilename;
73		FDatabase.Open;
74		FQuery := TABSQuery.Create(FDatabase);
75	+	FQuery.DisableControls;
76	+	FQuery.RequestLive := False;
77		FQuery.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID);
78		FQuery.SQL.Text := 'SELECT [name],[value] FROM globals ORDER BY [name] ASC';
79		FQuery.Open;
#	Line 86 | Line 90 | begin
90		end;
91		if FQuery.FieldByName('name').AsString = 'lvl' then
92		FLevelNumber := StrToInt(FQuery.FieldByName('value').AsString);
93	<	if FQuery.FieldByName('name').AsString = 'DataOS' then
93	>	if FQuery.FieldByName('name').AsString = 'os' then
94		begin
95		if FQuery.FieldByName('value').AsString = 'WIN' then
96		FDataOS := DOS_WIN
#	Line 209 | Line 213 | end;
213
214
215
216	+	function CompareItems(List: TStringList; I1, I2: Integer): Integer;
217	+	var
218	+	s1, s2: String;
219	+	begin
220	+	s1 := MidStr(List[I1], 1, PosEx(';', List[I1], 6) - 1);
221	+	s2 := MidStr(List[I2], 1, PosEx(';', List[I2], 6) - 1);
222	+	Result := CompareStr(s1, s2);
223	+	end;
224
225		function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;
226		NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
#	Line 249 | Line 261 | var
261
262		begin
263		list := TStringList.Create;
264	<	list.Sorted := True;
264	>	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
265	>	list.Sorted := False
266	>	else
267	>	list.Sorted := True;
268		for i := 0 to GetFileCount - 1 do
269		begin
270		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
#	Line 266 | Line 281 | begin
281		ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
282		ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
283		ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
284	<	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
284	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(extension + ';' + name + ';' + id);
285		end;
286		end;
287		end;
288		end;
289	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
290	+	list.CustomSort(CompareItems);
291		if not Assigned(Result) then
292		Result := TStringList.Create;
293		if list.Count > 0 then

Diff Legend

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