vistarpc4r 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/vistarpc4r/rpc_broker_connection.rb

@@ -36,13 +36,19 @@ module VistaRPC4r
       @port=port
       @access=access
       @verify=verify
-      @debug=debug
+      if debug
+        @loglevel=2
+      else
+        @loglevel=0
+      end
       @token=nil
       @socket = nil
       @encryptedAV = nil
       @writeBuffer = String.new
       @duz = "0"
       @currentContext = nil
+      @lastvistaerror = nil
+
     end
     
     def connect
@@ -70,7 +76,8 @@ module VistaRPC4r
       retVal = logIn()
       return retVal
     end
-    
+
+    # close tries to gracefully end the VistA session.  If socket is already dead, will return nil
     def close()
       if isConnected()
         if @sentConnect
@@ -81,36 +88,49 @@ module VistaRPC4r
           @socket.close()
           @socket = nil
           @duz = "0"
+          @lastvistaerror = nil
           @currentContext = nil
           return retval
         end
       end
     end
+
+    # force the broker into the pre connect state.  Use if close returns nil
+    def forceclose
+      @sentConnect = false  # set in connect()
+      @signedOn=false  # set in signOn() inside connect()
+      @socket.close()
+      @socket = nil
+      @duz = "0"
+      @currentContext = nil
+      @lastvistaerror=nil
+      return true
+    end
     
     def isConnected()
       return @socket != nil
     end
     
+    # execute differs from RPCBrokerConnection - We want the application to know about eof
+    # execute will return nil if ioerror most likely unexpected EOFError
     def execute(rpc)
+      @lastvistaerror = nil
       retVal = executeOnce(rpc)
       if (retVal == nil && @signedOn) 
-        #reconnect
+        #maybe some reconnect logic
         if (rpc.name == "#BYE#")
           # We're disconnecting anyway
           return nil
         end
         # attempt to log back on
-        if (connect())
-          if (@currentContext != nil) 
-            tempcontext = @currentContext
-            @currentContext = nil
-            setContext(tempcontext)
-          end
-          retVal = executeOnce(rpc)
-        end
-      end
-      if (retVal == nil)
-        raise "Lost connection to server"
+        #if (connect())
+        #  if (@currentContext != nil) 
+        #    tempcontext = @currentContext
+        #    @currentContext = nil
+        #    setContext(tempcontext)
+        #  end
+        #  retVal = executeOnce(rpc)
+        #end
       end
       return retVal
     end
@@ -139,6 +159,12 @@ module VistaRPC4r
         rpc.params = args
       end
       rpcresponse = execute(rpc)
+      if rpcresponse.nil?
+        return nil
+      end
+      if !rpcresponse.error_message.nil?
+        @lastvistaerror = rpcresponse.error_message
+      end
       return rpcresponse.value
     end
 
@@ -152,9 +178,19 @@ module VistaRPC4r
         rpc.params = args
       end
       rpcresponse = execute(rpc)
+      if rpcresponse.nil?
+        return nil
+      end
+      if !rpcresponse.error_message.nil?
+        @lastvistaerror = rpcresponse.error_message
+      end
       return rpcresponse.value
     end
 
+    # if call_a or call_s return nil, you can check to see if there was a VistA error message
+    def lastvistaerror
+      return @lastvistaerror
+    end
     
     def setContext(context)
       if (context == @currentContext)
@@ -165,7 +201,7 @@ module VistaRPC4r
         warn "changing context from " + @currentContext + " to " + context
       end
       
-      puts "Setting context to: " + context
+      #puts "Setting context to: " + context
       xwbCreateContext = VistaRPC.new("XWB CREATE CONTEXT", RPCResponse::SINGLE_VALUE)
       encryptedContext = xwbCreateContext.encrypt(context)
       xwbCreateContext.params[0] = encryptedContext
@@ -182,7 +218,14 @@ module VistaRPC4r
       return @duz
     end
     
-    
+    # set log level  0= off, 1= informational, 2=debug
+    def loglevel(level)
+      if level < 0 or level > 2
+        return nil
+      end
+      @loglevel = level
+      return @loglevel
+    end
     
     private  
     
@@ -259,8 +302,12 @@ module VistaRPC4r
       write(END_MARKER)
       if (flush())
         retVal = getResponse(rpc.type)
-        if @debug
-          puts "<Response> " + retVal.to_s + "</Response>"
+        if @loglevel ==2
+          if retVal.nil?  # io error
+            puts "<Response> IO Error </Response>"
+          else
+            puts "<Response> " + retVal.to_s + "</Response>"
+          end
         end
       end
       return retVal
@@ -350,7 +397,7 @@ module VistaRPC4r
     def flush()
       retVal = false
       if (isConnected() || connect()) 
-        if @debug
+        if @loglevel ==2
           puts "<Request>" + @writeBuffer + "</Request>"
         end
         @socket.write(@writeBuffer)
@@ -361,21 +408,24 @@ module VistaRPC4r
       return retVal
     end
     
+    # Get response will return a response object or nil
+    # Response object could contain a vista generated security/other error
+    # Nil means something went wrong with the connection, check the system error
     def getResponse(rpcType)
       hadError = Array.new  # for passing around boolean by reference
       hadError[0]=false
+
+      # Check for VistA erros
       securityError = readSPack(hadError)
-      #puts "<SecurityError>" + securityError + "</SecurityError>"
       if (hadError[0])
-        return nil
+        return nil # had a io error
       end
       if (securityError.empty?)
         securityError = nil
       end
-      
       otherError = readSPack(hadError)
       if (hadError[0])
-        return nil
+        return nil  # had a io error
       end
       if (otherError.empty?)
         otherError = nil
@@ -445,7 +495,17 @@ module VistaRPC4r
       buffer = String.new
       gotCR = false
       while true
-        byte = @socket.readbyte  # read one byte
+        begin
+          byte = @socket.readbyte  # read one byte
+        rescue EOFError => emsg
+          if (hadError != nil) 
+            hadError[0] = true
+          end
+          if @loglevel ==2
+            puts "EOFError"
+          end
+          return nil
+        end      
         if (byte == END_MARKER)
           if (endMarker != nil) 
             endMarker[0] = true
@@ -474,9 +534,32 @@ module VistaRPC4r
       if (hadError != nil) 
         hadError[0] = false
       end
-      len = @socket.readbyte  # read one byte into a fixnum
+      
+      begin
+        len = @socket.readbyte  # read one byte into a fixnum
+      rescue EOFError => emsg
+        if (hadError != nil) 
+          hadError[0] = true
+        end
+        if @loglevel ==2
+          puts "EOFError"
+        end
+        return nil
+      end
+        
       data = String.new
-      data = @socket.read(len)
+      begin
+        data = @socket.read(len)
+      rescue EOFError => emsg
+        if (hadError != nil) 
+          hadError[0] = true
+        end
+        if @loglevel ==2
+          puts "EOFError"
+        end
+        return nil
+      end 
+       
       return data
     end
     

data/vistarpc4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vistarpc4r}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Cham"]
-  s.date = %q{2011-08-30}
+  s.date = %q{2011-09-25}
   s.description = %q{more}
   s.email = %q{mike@blenderhouse.com}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/michaelcham/vistarpc4r}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Provides capability to make rpc calls to VistA EHR systems that have rpcbroker running}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vistarpc4r
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mike Cham
@@ -15,12 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 -04:00
+date: 2011-09-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: shoulda
   type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
-  version_requirements: *id001
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +47,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +63,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  name: jeweler
-  version_requirements: *id003
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,9 +77,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id004
-  prerelease: false
+  requirement: *id004
 description: more
 email: mike@blenderhouse.com
 executables: []
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Provides capability to make rpc calls to VistA EHR systems that have rpcbroker running