--- oup/current/DataAccess/Access_OUP_ADB.pas 2007/02/26 22:57:02 116 +++ oup/current/DataAccess/Access_OUP_ADB.pas 2007/04/01 21:14:29 155 @@ -18,7 +18,6 @@ type procedure UpdateListCache; function GetLinksToFile(FileID: Integer): TLinks; - function GetLinksFromFile(FileID: Integer): TLinks; function GetFileInfo(FileID: Integer): TFileInfo; override; function GetFilesList(Ext: String; Pattern: String; @@ -67,10 +66,14 @@ begin FFileName := DBFilename; FDatabase := TABSDatabase.Create(nil); + FDatabase.Exclusive := True; + FDatabase.MultiUser := False; FDatabase.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID); FDatabase.DatabaseFileName := DBFilename; FDatabase.Open; FQuery := TABSQuery.Create(FDatabase); + FQuery.DisableControls; + FQuery.RequestLive := False; FQuery.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID); FQuery.SQL.Text := 'SELECT [name],[value] FROM globals ORDER BY [name] ASC'; FQuery.Open; @@ -193,27 +196,6 @@ begin FQuery.Close; end; -function TAccess_OUP_ADB.GetLinksFromFile(FileID: Integer): TLinks; -var - i: Integer; -begin - SetLength(Result.ByName, 0); - FQuery.SQL.Text := 'SELECT src_link_offset, target_id FROM linkmap WHERE src_id = ' + IntToStr(FileID) + ' ORDER BY target_id ASC;'; - FQuery.Open; - SetLength(Result.ByID, FQuery.RecordCount); - if FQuery.RecordCount > 0 then - begin - i := 0; - repeat - Result.ByID[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger; - Result.ByID[i].Destination := FQuery.FieldByName('target_id').AsInteger; - Inc(i); - FQuery.Next; - until FQuery.EOF; - end; - FQuery.Close; -end; - function TAccess_OUP_ADB.GetFileInfo(fileid: Integer): TFileInfo; @@ -271,6 +253,7 @@ var begin list := TStringList.Create; + list.CaseSensitive := True; list.Sorted := True; for i := 0 to GetFileCount - 1 do begin @@ -288,7 +271,7 @@ begin ST_IDAsc, ST_IDDesc: list.Add(id + ';' + name + ';' + extension); ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension); ST_ExtAsc, ST_ExtDesc: list.Add(extension + ';' + id + ';' + name); - ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id); + ST_ExtNameAsc, ST_ExtNameDesc: list.Add(extension + ';' + name + ';' + id); end; end; end;