ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/fbintf/client/2.5/FB25Blob.pas
(Generate patch)

Comparing ibx/trunk/fbintf/client/2.5/FB25Blob.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 60 by tony, Mon Mar 27 15:21:02 2017 UTC

# Line 60 | Line 60
60   {                                                                        }
61   {************************************************************************}
62   unit FB25Blob;
63 + {$IFDEF MSWINDOWS}
64 + {$DEFINE WINDOWS}
65 + {$ENDIF}
66  
67   {$IFDEF FPC}
68 < {$mode objfpc}{$H+}
68 > {$mode delphi}
69   {$interfaces COM}
70   {$ENDIF}
71  
# Line 70 | Line 73 | interface
73  
74   uses
75    Classes, SysUtils, IB,  IBHeader,IBExternals, FBClientAPI, FB25ClientAPI, FB25Attachment,
76 <  FB25Transaction, FBActivityMonitor, FBBlob;
76 >  FB25Transaction, FBActivityMonitor, FBBlob, FBOutputBlock;
77  
78   type
79  
# Line 82 | Line 85 | type
85       FAttachment: TFB25Attachment;
86       FTransaction: TFB25Transaction;
87     protected
88 +     function Attachment: IAttachment; override;
89       procedure NeedFullMetadata; override;
90     public
91       constructor Create(Attachment: TFB25Attachment; Transaction: TFB25Transaction;
92 <       RelationName, ColumnName: string); overload;
92 >       RelationName, ColumnName: AnsiString); overload;
93       constructor Create(Attachment: TFB25Attachment; Transaction: TFB25Transaction;
94 <       RelationName, ColumnName: string; SubType: integer); overload;
94 >       RelationName, ColumnName: AnsiString; SubType: integer); overload;
95    end;
96  
97  
# Line 101 | Line 105 | type
105      procedure CheckReadable; override;
106      procedure CheckWritable; override;
107      function GetIntf: IBlob; override;
108 +    procedure GetInfo(Request: array of byte; Response: IBlobInfo); override;
109      procedure InternalClose(Force: boolean); override;
110      procedure InternalCancel(Force: boolean); override;
111    public
# Line 113 | Line 118 | type
118      property Handle: TISC_BLOB_HANDLE read FHandle;
119  
120    public
116 –    procedure GetInfo(var NumSegments: Int64; var MaxSegmentSize, TotalSize: Int64;
117 –      var BlobType: TBlobType); override;
121      function Read(var Buffer; Count: Longint): Longint; override;
122      function Write(const Buffer; Count: Longint): Longint; override;
123    end;
# Line 125 | Line 128 | uses IBErrorCodes, FBMessages, FBParamBl
128  
129   { TFB25BlobMetaData }
130  
131 + function TFB25BlobMetaData.Attachment: IAttachment;
132 + begin
133 +  Result := FAttachment;
134 + end;
135 +
136   procedure TFB25BlobMetaData.NeedFullMetadata;
137   var
138    BlobDesc: TISC_BLOB_DESC;
139    Global: array [0..31] of char;
140 +  RelName: AnsiString;
141 +  ColName: AnsiString;
142   begin
143    if FHasFullMetaData then Exit;
144  
145    FSegmentSize := 80;
146 <  if (GetColumnName <> '') and (GetRelationName <> '') then
146 >  RelName := AnsiUpperCase(GetRelationName);
147 >  ColName := AnsiUpperCase(GetColumnName);
148 >  if (ColName <> '') and (RelName <> '') then
149    begin
150      with Firebird25ClientAPI do
151        Call(isc_blob_lookup_desc(StatusVector,@(FAttachment.Handle),
152                                              @(FTransaction.Handle),
153 <                PChar(AnsiUpperCase(GetRelationName)),PChar(AnsiUpperCase(GetColumnName)),@BlobDesc,@Global));
153 >                PAnsiChar(RelName),PAnsiChar(ColName),@BlobDesc,@Global));
154      if FUnconfirmedCharacterSet then
155        FCharSetID := BlobDesc.blob_desc_charset;
156      FSubType := BlobDesc.blob_desc_subtype;
# Line 157 | Line 169 | begin
169   end;
170  
171   constructor TFB25BlobMetaData.Create(Attachment: TFB25Attachment;
172 <  Transaction: TFB25Transaction; RelationName, ColumnName: string);
172 >  Transaction: TFB25Transaction; RelationName, ColumnName: AnsiString);
173   begin
174    inherited Create(Transaction,RelationName,ColumnName);
175    FAttachment := Attachment;
# Line 165 | Line 177 | begin
177   end;
178  
179   constructor TFB25BlobMetaData.Create(Attachment: TFB25Attachment;
180 <  Transaction: TFB25Transaction; RelationName, ColumnName: string;
180 >  Transaction: TFB25Transaction; RelationName, ColumnName: AnsiString;
181    SubType: integer);
182   begin
183    Create(Attachment,Transaction,RelationName,ColumnName);
# Line 192 | Line 204 | begin
204    Result := self;
205   end;
206  
207 + procedure TFB25Blob.GetInfo(Request: array of byte; Response: IBlobInfo);
208 + begin
209 +  if FHandle = nil then
210 +    IBError(ibxeBlobNotOpen,[nil]);
211 +
212 +  with Firebird25ClientAPI, Response as TBlobInfo do
213 +    Call(isc_blob_info(StatusVector, @FHandle, Length(Request),@Request,
214 +                                               GetBufSize, Buffer));
215 + end;
216 +
217   procedure TFB25Blob.InternalClose(Force: boolean);
218   begin
219    if FHandle = nil then
# Line 272 | Line 294 | begin
294                     @FBlobID, getDataLength, getBuffer));
295   end;
296  
275 – procedure TFB25Blob.GetInfo(var NumSegments: Int64; var MaxSegmentSize,
276 –  TotalSize: Int64; var BlobType: TBlobType);
277 – var
278 –  items: array[0..3] of Char;
279 –  results: array[0..99] of Char;
280 –  i, item_length: Integer;
281 –  item: Integer;
282 – begin
283 –  if FHandle = nil then
284 –    IBError(ibxeBlobNotOpen,[nil]);
285 –
286 –  items[0] := Char(isc_info_blob_num_segments);
287 –  items[1] := Char(isc_info_blob_max_segment);
288 –  items[2] := Char(isc_info_blob_total_length);
289 –  items[3] := Char(isc_info_blob_type);
290 –
291 –  with Firebird25ClientAPI do
292 –  begin
293 –    Call(isc_blob_info(StatusVector, @FHandle, 4, @items[0], SizeOf(results),
294 –                    @results[0]));
295 –    i := 0;
296 –    while (i < SizeOf(results)) and (results[i] <> Char(isc_info_end)) do
297 –    begin
298 –      item := Integer(results[i]); Inc(i);
299 –      item_length := isc_portable_integer(@results[i], 2); Inc(i, 2);
300 –      case item of
301 –        isc_info_blob_num_segments:
302 –          NumSegments := isc_portable_integer(@results[i], item_length);
303 –        isc_info_blob_max_segment:
304 –          MaxSegmentSize := isc_portable_integer(@results[i], item_length);
305 –        isc_info_blob_total_length:
306 –          TotalSize := isc_portable_integer(@results[i], item_length);
307 –        isc_info_blob_type:
308 –          if isc_portable_integer(@results[i], item_length) = 0 then
309 –            BlobType := btSegmented
310 –          else
311 –            BlobType := btStream;
312 –      end;
313 –      Inc(i, item_length);
314 –    end;
315 –  end;
316 – end;
317 –
297   function TFB25Blob.Read(var Buffer; Count: Longint): Longint;
298   var
299    BytesRead : UShort;
300 <  LocalBuffer: PChar;
300 >  LocalBuffer: PByte;
301    returnCode: long;
302    localCount: uShort;
303   begin
# Line 327 | Line 306 | begin
306    if FEOB then
307      Exit;
308  
309 <  LocalBuffer := PChar(@Buffer);
309 >  LocalBuffer := PByte(@Buffer);
310    repeat
311      if Count > MaxuShort then
312        localCount := MaxuShort
# Line 349 | Line 328 | end;
328  
329   function TFB25Blob.Write(const Buffer; Count: Longint): Longint;
330   var
331 <  LocalBuffer: PChar;
331 >  LocalBuffer: PByte;
332    localCount: uShort;
333   begin
334    CheckWritable;
335 <  LocalBuffer := PChar(@Buffer);
335 >  LocalBuffer := PByte(@Buffer);
336    Result := 0;
337    if Count = 0 then Exit;
338  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines