--- oup/current/DataAccess/Access_OUP_ADB.pas 2007/04/02 00:29:55 159 +++ oup/current/DataAccess/Access_OUP_ADB.pas 2009/05/06 13:47:23 321 @@ -34,6 +34,7 @@ type function GetDatLink(FileID, DatOffset: Integer): TDatLink; override; function GetRawList(FileID: Integer): TRawDataList; override; function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override; + function GetRawsForType(RawType: String): TRawDataList; override; procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override; procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override; @@ -90,7 +91,7 @@ begin end; if FQuery.FieldByName('name').AsString = 'lvl' then FLevelNumber := StrToInt(FQuery.FieldByName('value').AsString); - if FQuery.FieldByName('name').AsString = 'DataOS' then + if FQuery.FieldByName('name').AsString = 'os' then begin if FQuery.FieldByName('value').AsString = 'WIN' then FDataOS := DOS_WIN @@ -112,6 +113,8 @@ begin FChangeRights := [CR_EditDat, CR_EditRaw, CR_ResizeDat, CR_ResizeRaw]; UpdateListCache; + + inherited; end; @@ -265,6 +268,8 @@ begin list.Sorted := False else list.Sorted := True; + if ext = '*' then + ext := ''; for i := 0 to GetFileCount - 1 do begin if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and @@ -487,7 +492,7 @@ var i: Integer; begin SetLength(Result, 0); - FQuery.SQL.Text := 'SELECT [src_link_offset],[size],[sep] FROM rawmap WHERE [src_id]=' + + FQuery.SQL.Text := 'SELECT [src_link_offset],[name],[size],[sep],[type] FROM rawmap WHERE [src_id]=' + IntToStr(fileid) + ' ORDER BY src_link_offset ASC;'; FQuery.Open; if FQuery.RecordCount > 0 then @@ -496,11 +501,13 @@ begin SetLength(Result, FQuery.RecordCount); i := 0; repeat + Result[i].Name := FQuery.FieldByName('name').AsString; Result[i].SrcID := fileid; Result[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger; Result[i].RawAddr := 0; Result[i].RawSize := FQuery.FieldByName('size').AsInteger; Result[i].LocSep := FQuery.FieldByName('sep').AsBoolean; + Result[i].RawType := FQuery.FieldByName('type').AsString; Inc(i); FQuery.Next; until FQuery.EOF; @@ -523,15 +530,47 @@ begin if i < Length(rawlist) then Result := rawlist[i] else begin + Result.Name := ''; Result.SrcID := -1; Result.SrcOffset := -1; Result.RawAddr := -1; Result.RawSize := -1; + Result.RawType := ''; end; end; end; +function TAccess_OUP_ADB.GetRawsForType(RawType: String): TRawDataList; +var + i: Integer; +begin + SetLength(Result, 0); + FQuery.SQL.Text := 'SELECT [src_id],[src_link_offset],[name],[size],[sep] FROM rawmap ' + + 'WHERE [type]="' + RawType + '" and [size]>0 ORDER BY src_id ASC, src_link_offset ASC;'; + FQuery.Open; + if FQuery.RecordCount > 0 then + begin + FQuery.First; + SetLength(Result, FQuery.RecordCount); + i := 0; + repeat + Result[i].Name := FQuery.FieldByName('name').AsString; + Result[i].SrcID := FQuery.FieldByName('src_id').AsInteger; + Result[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger; + Result[i].RawAddr := 0; + Result[i].RawSize := FQuery.FieldByName('size').AsInteger; + Result[i].LocSep := FQuery.FieldByName('sep').AsBoolean; + Result[i].RawType := RawType; + Inc(i); + FQuery.Next; + until FQuery.EOF; + end; + FQuery.Close; +end; + + + procedure TAccess_OUP_ADB.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); var