Changeset 492 for cprs/branches/GUI-config/CPRS-Lib/ORNet.pas

Timestamp:

Sep 17, 2008, 5:34:43 PM (16 years ago)

Author:

Kevin Toppenberg

Message:

Resync

File:

• cprs/branches/GUI-config/CPRS-Lib/ORNet.pas (modified) (7 diffs)

cprs/branches/GUI-config/CPRS-Lib/ORNet.pas

@@ -1 +1 @@
 unit ORNet;
 
+{$DEFINE CCOWBROKER}
+
 interface
 
-uses SysUtils, Windows, Classes, Forms, Controls, ORFn, TRPCB, RPCConf1, Dialogs; //, SharedRPCBroker;
+uses SysUtils, Windows, Classes, Forms, Controls, ORFn, TRPCB, RPCConf1, Dialogs    
+{$IFDEF CCOWBROKER}, CCOWRPCBroker {$ENDIF} ;  //, SharedRPCBroker;
+
 
 procedure SetBrokerServer(const AName: string; APort: Integer; WantDebug: Boolean);
@@ -22 +26 @@
 function DottedIPStr: string;
 procedure CallRPCWhenIdle(CallProc: TORIdleCallProc; Msg: String);
+
 procedure EnsureBroker;
 
@@ -31 +36 @@
 
 var
-  //RPCBrokerV: TSharedRPCBroker;                        // an RPC Broker object - used by all calls
+{$IFDEF CCOWBROKER}
+  RPCBrokerV: TCCOWRPCBroker;
+{$ELSE}
   RPCBrokerV: TRPCBroker;
+  //RPCBrokerV: TSharedRPCBroker;
+{$ENDIF}
   RPCLastCall: string;
 
@@ -58 +67 @@
   if RPCBrokerV = nil then
   begin
+{$IFDEF CCOWBROKER}
+    RPCBrokerV := TCCOWRPCBroker.Create(Application);
+{$ELSE}
+    RPCBrokerV := TRPCBroker.Create(Application);
     //RPCBrokerV := TSharedRPCBroker.Create(Application);
-    RPCBrokerV := TRPCBroker.Create(Application);
+{$ENDIF}
     with RPCBrokerV do
     begin
@@ -104 +117 @@
       vtInteger:    Param[i].Value := IntToStr(VInteger);
       vtBoolean:    Param[i].Value := BoolChar[VBoolean];
-      vtChar:       Param[i].Value := VChar;
+      vtChar:       if VChar = #0 then
+                      Param[i].Value := ''
+                    else
+                      Param[i].Value := VChar;
       //vtExtended:   Param[i].Value := FloatToStr(VExtended^);
       vtExtended:   begin
@@ -174 +190 @@
   RPCLastCall := RPCBrokerV.RemoteProcedure + ' (CallBroker begin)';
   if uShowRPCs then StatusText(RPCBrokerV.RemoteProcedure);
-  with RPCBrokerV do if not Connected then  // Happens if broker connection is lost.
+  with RPCBrokerV do if not Connected then  // happens if broker connection is lost
   begin
     ClearResults := True;
@@ -339 +355 @@
   Screen.Cursor := crHourGlass;
   SetParams(RPCName, AParam);
-  CallBroker;  //RPCBrokerV.Call;     //kt note: this creates an error if connection was aborted.  Fix later
+  CallBroker;  //RPCBrokerV.Call;
   Screen.Cursor := SavedCursor;
 end;