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 221 by tony, Mon Mar 19 09:48:37 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 >      ibxeMultiThreadRequired,
256 >      ibxeODSVersionRequired
257        );
258  
259 < function GetErrorMessage(ErrMess: TIBClientError): string;
259 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
260  
261   resourcestring
262    { generic strings used in code }
# Line 373 | Line 389 | resourcestring
389    SServerNameMissing = 'Server Name Missing';
390    SQueryParamsError = 'Query Parameters missing or incorrect';
391    SStartParamsError = 'start Parameters missing or incorrect';
392 <  SOutputParsingError = 'Unexpected Output buffer value (%d)';
392 >  SOutputParsingError = 'Unexpected Output buffer value (%d) - %s';
393    SUseSpecificProcedures = 'Generic ServiceStart not applicable: Use Specific Procedures to set configuration params';
394    SSQLMonitorAlreadyPresent = 'SQL Monitor Instance is already present';
395    SDelphiException = 'DelphiException %s';
# Line 433 | Line 449 | resourcestring
449    SInvalidVariantType = 'Invalid variant type';
450    SServiceRunning = 'Cannot start a new service while an existing service is running';
451    SUniqueRelationReqd = 'All Output Fields must derived from the same table';
452 +  SInterfaceNotSupported = 'Interface not supported; Guid %s not found';
453 +  SCharacterSetExists = 'Character set "%s" is already defined';
454 +  SUnknownUserCharSet = 'Unknown user character set "%s"';
455 +  SUninitializedInputParameter = 'SQL Param No. %d (%s) is uninitialised';
456 +  SNegativeGenerator = 'A Generator Increment cannot be negative';
457 +  SServiceUnavailable = 'Request Service is not available';
458 +  SBadConnectString = 'Parse Error in Connect String';
459 +  SServiceNotStarted = 'Cannot Query running service until the service has been started';
460 +  SNotRequiredDataSetSource = 'Object of class %s is not a valid dataset source';
461 +  SNoLimboTransactionInsert = 'You cannot add to a Limbo Transaction list';
462 +  SDatabaseNotConnected = 'Cannot connect using an unattached database';
463 +  SMultiThreadRequired = 'Multi-threading required for %s but not enabled. Please recompile with multi-threading support enabled. '+
464 +                         'Hint: you probably need to add -dUseCThreads to the Custom Options.';
465 +  SODSVersionRequired = 'This feature requires ODS Version %s or later';
466  
467   const
468    IBErrorMessages: array[TIBClientError] of string = (
# Line 595 | Line 625 | const
625      SInvalidParamCount,
626      SInvalidVariantType,
627      SServiceRunning,
628 <    SUniqueRelationReqd
628 >    SUniqueRelationReqd,
629 >    SInterfaceNotSupported,
630 >    SCharacterSetExists,
631 >    SUnknownUserCharSet,
632 >    SUninitializedInputParameter,
633 >    SNegativeGenerator,
634 >    SServiceUnavailable,
635 >    SBadConnectString,
636 >    SServiceNotStarted,
637 >    SNotRequiredDataSetSource,
638 >    SNoLimboTransactionInsert,
639 >    SDatabaseNotConnected,
640 >    SMultiThreadRequired,
641 >    SODSVersionRequired
642    );
643  
644 < function GetErrorMessage(ErrMess: TIBClientError): string;
644 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
645   begin
646    Result := IBErrorMessages[ErrMess];
647   end;

Diff Legend

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