--- oup/rewrite/Tools/Extractor.pas	2007/01/18 17:15:59	93
+++ oup/current/Tools/Extractor.pas	2007/02/21 03:12:33	109
@@ -35,7 +35,7 @@ var
 
 implementation
 {$R *.dfm}
-uses Main, Functions, Data, OniDataClass, FolderBrowser, Exporters;
+uses Main, Functions, Data, ConnectionManager, FolderBrowser, Exporters;
 
 
 procedure TForm_Extractor.FormCreate(Sender: TObject);
@@ -104,14 +104,14 @@ begin
   begin
     if (selonly and filelist.Selected[i]) or not selonly then
     begin
-      fileid := Connection.ExtractFileID(filelist.Items.Strings[i]);
+      fileid := ConManager.Connection[ConnectionID].ExtractFileIDOfName(filelist.Items.Strings[i]);
       filename := GetWinFilename(filelist.Items.Strings[i]);
       if check_dat.Checked then
-        ExportDatFile(Connection, fileid, path + filename);
+        ExportDatFile(ConnectionID, fileid, path + filename);
       if check_raw.Checked then
-        ExportRawFiles(Connection, fileid, path + filename);
+        ExportRawFiles(ConnectionID, fileid, path + filename);
       if check_convert.Checked then
-        ExportConverted(Connection, fileid, path + filename);
+        ExportConverted(ConnectionID, fileid, path + filename);
       Inc(done);
     end;
     if ((done mod 10) = 0) and (done >= 50) then