ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/udr/client/FBMessages.pas
(Generate patch)

Comparing ibx/trunk/fbintf/client/FBMessages.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 209 by tony, Wed Mar 14 12:48:51 2018 UTC

# Line 60 | Line 60
60   {                                                                        }
61   {************************************************************************}
62   unit FBMessages;
63 + {$IFDEF MSWINDOWS}
64 + {$DEFINE WINDOWS}
65 + {$ENDIF}
66  
67   {$IFDEF FPC}
68 < {$mode objfpc}{$H+}
68 > {$mode delphi}
69   {$codepage UTF8}
70   {$ENDIF}
71  
# Line 237 | Line 240 | type
240        ibxeInvalidParamCount,
241        ibxeInvalidVariantType,
242        ibxeServiceRunning,
243 <      ibxeUniqueRelationReqd
243 >      ibxeUniqueRelationReqd,
244 >      ibxeInterfaceNotSupported,
245 >      ibxeCharacterSetExists,
246 >      ibxeUnknownUserCharSet,
247 >      ibxeUninitializedInputParameter,
248 >      ibxeNegativeGenerator,
249 >      ibxeServiceUnavailable,
250 >      ibxeBadConnectString,
251 >      ibxeServiceNotStarted,
252 >      ibxeNotRequiredDataSetSource,
253 >      ibxeNoLimboTransactionInsert,
254 >      ibxeDatabaseNotConnected
255        );
256  
257 < function GetErrorMessage(ErrMess: TIBClientError): string;
257 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
258  
259   resourcestring
260    { generic strings used in code }
# Line 373 | Line 387 | resourcestring
387    SServerNameMissing = 'Server Name Missing';
388    SQueryParamsError = 'Query Parameters missing or incorrect';
389    SStartParamsError = 'start Parameters missing or incorrect';
390 <  SOutputParsingError = 'Unexpected Output buffer value (%d)';
390 >  SOutputParsingError = 'Unexpected Output buffer value (%d) - %s';
391    SUseSpecificProcedures = 'Generic ServiceStart not applicable: Use Specific Procedures to set configuration params';
392    SSQLMonitorAlreadyPresent = 'SQL Monitor Instance is already present';
393    SDelphiException = 'DelphiException %s';
# Line 433 | Line 447 | resourcestring
447    SInvalidVariantType = 'Invalid variant type';
448    SServiceRunning = 'Cannot start a new service while an existing service is running';
449    SUniqueRelationReqd = 'All Output Fields must derived from the same table';
450 +  SInterfaceNotSupported = 'Interface not supported; Guid %s not found';
451 +  SCharacterSetExists = 'Character set "%s" is already defined';
452 +  SUnknownUserCharSet = 'Unknown user character set "%s"';
453 +  SUninitializedInputParameter = 'SQL Param No. %d (%s) is uninitialised';
454 +  SNegativeGenerator = 'A Generator Increment cannot be negative';
455 +  SServiceUnavailable = 'Request Service is not available';
456 +  SBadConnectString = 'Parse Error in Connect String';
457 +  SServiceNotStarted = 'Cannot Query running service until the service has been started';
458 +  SNotRequiredDataSetSource = 'Object of class %s is not a valid dataset source';
459 +  SNoLimboTransactionInsert = 'You cannot add to a Limbo Transaction list';
460 +  SDatabaseNotConnected = 'Cannot connect using an unattached database';
461  
462   const
463    IBErrorMessages: array[TIBClientError] of string = (
# Line 595 | Line 620 | const
620      SInvalidParamCount,
621      SInvalidVariantType,
622      SServiceRunning,
623 <    SUniqueRelationReqd
623 >    SUniqueRelationReqd,
624 >    SInterfaceNotSupported,
625 >    SCharacterSetExists,
626 >    SUnknownUserCharSet,
627 >    SUninitializedInputParameter,
628 >    SNegativeGenerator,
629 >    SServiceUnavailable,
630 >    SBadConnectString,
631 >    SServiceNotStarted,
632 >    SNotRequiredDataSetSource,
633 >    SNoLimboTransactionInsert,
634 >    SDatabaseNotConnected
635    );
636  
637 < function GetErrorMessage(ErrMess: TIBClientError): string;
637 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
638   begin
639    Result := IBErrorMessages[ErrMess];
640   end;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines