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 134 by alloc, Wed Mar 28 17:53:54 2007 UTC vs.
Revision 157 by alloc, Sun Apr 1 23:47:18 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 73 | Line 73 | begin
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 212 | Line 213 | end;
213
214
215
215	–
216		function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;
217		NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
218		var
#	Line 251 | Line 251 | var
251		end;
252
253		begin
254	<	list := TStringList.Create;
255	<	list.Sorted := True;
256	<	for i := 0 to GetFileCount - 1 do
257	<	begin
258	<	if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
259	<	((Length(pattern) = 0) or
260	<	(Pos(UpperCase(pattern), UpperCase(Fdat_files[i].Name)) > 0)) then
254	>	if not (SortType in [ST_ExtNameAsc, ST_ExtNameDesc]) then
255	>	begin
256	>	list := TStringList.Create;
257	>	list.Sorted := True;
258	>	for i := 0 to GetFileCount - 1 do
259		begin
260	<	if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
260	>	if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
261	>	((Length(pattern) = 0) or
262	>	(Pos(UpperCase(pattern), UpperCase(Fdat_files[i].Name)) > 0)) then
263		begin
264	<	id := FormatNumber(Fdat_files[i].ID, 5, '0');
265	<	name := Fdat_files[i].Name;
266	<	extension := Fdat_files[i].Extension;
267	<
268	<	case SortType of
269	<	ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
270	<	ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
271	<	ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
272	<	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
264	>	if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
265	>	begin
266	>	id := FormatNumber(Fdat_files[i].ID, 5, '0');
267	>	name := Fdat_files[i].Name;
268	>	extension := Fdat_files[i].Extension;
269	>
270	>	case SortType of
271	>	ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
272	>	ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
273	>	ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
274	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(extension + ';' + name + ';' + id);
275	>	end;
276		end;
277		end;
278		end;
279	+	if not Assigned(Result) then
280	+	Result := TStringList.Create;
281	+	if list.Count > 0 then
282	+	begin
283	+	fields := TStringList.Create;
284	+	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
285	+	for i := 0 to list.Count - 1 do
286	+	begin
287	+	getfields;
288	+	Result.Add(id + '-' + name + '.' + extension);
289	+	end
290	+	else
291	+	for i := list.Count - 1 downto 0 do
292	+	begin
293	+	getfields;
294	+	Result.Add(id + '-' + name + '.' + extension);
295	+	end;
296	+	fields.Free;
297	+	end;
298	+	list.Free;
299	+	end
300	+	else
301	+	begin
302	+	FQuery.SQL.Text := 'SELECT id, name, extension FROM datfiles ' +
303	+	'WHERE Length(name) > 0 ORDER BY extension ASC, name ASC;';
304	+	FQuery.Open;
305	+	if not Assigned(Result) then
306	+	Result := TStringList.Create;
307	+	if FQuery.RecordCount > 0 then
308	+	begin
309	+	FQuery.First;
310	+	repeat
311	+	name := FormatNumber(FQuery.FieldByName('id').AsInteger, 5, '0') +
312	+	'-' + FQuery.FieldByName('name').AsString + '.' +
313	+	FQuery.FieldByName('extension').AsString;
314	+	if SortType = ST_ExtNameAsc then
315	+	Result.Add(name)
316	+	else
317	+	Result.Insert(0, name);
318	+	FQuery.Next;
319	+	until FQuery.EOF;
320	+	end;
321	+	FQuery.Close;
322		end;
277	–	if not Assigned(Result) then
278	–	Result := TStringList.Create;
279	–	if list.Count > 0 then
280	–	begin
281	–	fields := TStringList.Create;
282	–	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
283	–	for i := 0 to list.Count - 1 do
284	–	begin
285	–	getfields;
286	–	Result.Add(id + '-' + name + '.' + extension);
287	–	end
288	–	else
289	–	for i := list.Count - 1 downto 0 do
290	–	begin
291	–	getfields;
292	–	Result.Add(id + '-' + name + '.' + extension);
293	–	end;
294	–	fields.Free;
295	–	end;
296	–	list.Free;
323		end;
324
325

Diff Legend

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