--- oup/current/DataAccess/Access_OUP_ADB.pas	2007/02/25 17:20:22	113
+++ oup/current/DataAccess/Access_OUP_ADB.pas	2007/03/29 14:20:25	136
@@ -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;
@@ -32,6 +31,7 @@ type
     procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override;
 
     function GetDatLinks(FileID: Integer): TDatLinkList; override;
+    function GetDatLink(FileID, DatOffset: Integer): TDatLink; override;
     function GetRawList(FileID: Integer): TRawDataList; override;
     function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
 
@@ -46,7 +46,7 @@ type
 implementation
 
 uses
-  SysUtils, Data, Functions, ABSDecUtil, DB;
+  SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks;
 
 
 (*
@@ -66,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;
@@ -192,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;
@@ -287,7 +270,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;
@@ -443,6 +426,48 @@ begin
   end;
 end;
 
+
+
+function TAccess_OUP_ADB.GetDatLink(FileID, DatOffset: Integer): TDatLink;
+begin
+  Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset);
+  FQuery.SQL.Text := 'SELECT target_id FROM linkmap WHERE src_id = ' + IntToStr(FileID) + ' and src_link_offset = ' + IntToStr(DatOffset) + ';';
+  FQuery.Open;
+  if FQuery.RecordCount > 0 then
+    Result.DestID := FQuery.FieldByName('target_id').AsInteger;
+  FQuery.Close;
+end;
+
+
+function TAccess_OUP_ADB.GetDatLinks(FileID: Integer): TDatLinkList;
+var
+  i: Integer;
+  SrcOffset, DestID: Integer;
+begin
+  Result := DatLinksManager.GetDatLinks(FConnectionID, FileID);
+  if Length(Result) > 0 then
+  begin
+    FQuery.SQL.Text := 'SELECT src_link_offset, target_id FROM linkmap WHERE src_id = ' + IntToStr(FileID) + ' ORDER BY src_link_offset ASC;';
+    FQuery.Open;
+    if FQuery.RecordCount > 0 then
+    begin
+      repeat
+        SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger;
+        DestID := FQuery.FieldByName('target_id').AsInteger;
+        for i := 0 to High(Result) do
+          if Result[i].SrcOffset = SrcOffset then
+            Break;
+        if i < Length(Result) then
+          Result[i].DestID := DestID
+        else
+          Result[i].DestID := -1;
+        FQuery.Next;
+      until FQuery.EOF;
+    end;
+    FQuery.Close;
+  end;
+end;
+
 
 function TAccess_OUP_ADB.GetRawList(FileID: Integer): TRawDataList;
 var