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 116 by alloc, Mon Feb 26 22:57:02 2007 UTC vs.
Revision 156 by alloc, Sun Apr 1 22:49:17 2007 UTC

#	Line 18 | Line 18 | type
18		procedure UpdateListCache;
19
20		function GetLinksToFile(FileID: Integer): TLinks;
21	–	function GetLinksFromFile(FileID: Integer): TLinks;
21
22		function GetFileInfo(FileID: Integer): TFileInfo; override;
23		function GetFilesList(Ext: String; Pattern: String;
#	Line 47 | 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 67 | 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 193 | Line 196 | begin
196		FQuery.Close;
197		end;
198
196	–	function TAccess_OUP_ADB.GetLinksFromFile(FileID: Integer): TLinks;
197	–	var
198	–	i: Integer;
199	–	begin
200	–	SetLength(Result.ByName, 0);
201	–	FQuery.SQL.Text := 'SELECT src_link_offset, target_id FROM linkmap WHERE src_id = ' + IntToStr(FileID) + ' ORDER BY target_id ASC;';
202	–	FQuery.Open;
203	–	SetLength(Result.ByID, FQuery.RecordCount);
204	–	if FQuery.RecordCount > 0 then
205	–	begin
206	–	i := 0;
207	–	repeat
208	–	Result.ByID[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger;
209	–	Result.ByID[i].Destination := FQuery.FieldByName('target_id').AsInteger;
210	–	Inc(i);
211	–	FQuery.Next;
212	–	until FQuery.EOF;
213	–	end;
214	–	FQuery.Close;
215	–	end;
216	–
199
200
201		function TAccess_OUP_ADB.GetFileInfo(fileid: Integer): TFileInfo;
#	Line 231 | Line 213 | end;
213
214
215
216	+	function CompareItems(List: TStringList; I1, I2: Integer): Integer;
217	+	var
218	+	fin: Boolean;
219	+	pos: Integer;
220	+	s1, s2: String;
221	+	begin
222	+	fin := False;
223	+	s1 := MidStr(List[I1], 1, PosEx(';', List[I1], 6) - 1);
224	+	s2 := MidStr(List[I2], 1, PosEx(';', List[I2], 6) - 1);
225	+	pos := 1;
226	+	Result := 0;
227	+	repeat
228	+	if Ord(s1[pos]) < Ord(s2[pos]) then
229	+	begin
230	+	Result := -1;
231	+	fin := True;
232	+	end
233	+	else if Ord(s1[pos]) > Ord(s2[pos]) then
234	+	begin
235	+	Result := 1;
236	+	fin := True;
237	+	end;
238	+	Inc(pos);
239	+	until fin or (pos > Length(s1)) or (pos > Length(s2));
240	+
241	+	if not fin then
242	+	begin
243	+	if pos > Length(s1) then
244	+	Result := -1
245	+	else
246	+	Result := 1;
247	+	end;
248	+	end;
249
250		function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;
251		NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
#	Line 271 | Line 286 | var
286
287		begin
288		list := TStringList.Create;
289	<	list.Sorted := True;
289	>	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
290	>	list.Sorted := False
291	>	else
292	>	list.Sorted := True;
293		for i := 0 to GetFileCount - 1 do
294		begin
295		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
#	Line 288 | Line 306 | begin
306		ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
307		ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
308		ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
309	<	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
309	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(extension + ';' + name + ';' + id);
310		end;
311		end;
312		end;
313		end;
314	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
315	+	list.CustomSort(CompareItems);
316		if not Assigned(Result) then
317		Result := TStringList.Create;
318		if list.Count > 0 then

Diff Legend

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