ebsco-discovery-service-api 1.0.2 → 1.0.3

data/lib/ebsco-discovery-service-api.rb

@@ -13,12 +13,12 @@ module EDSApi
 	# Connection object. Does what it says. ConnectionHandler is what is usually desired and wraps auto-reonnect features, etc.
 	class Connection
 
-	  attr_accessor :auth_token, :session_token
-	  
+	  attr_accessor :auth_token, :session_token, :debug_notes
 	  attr_writer :userid, :password
 	  
 	  # Init the object with userid and pass.
 		def uid_init(userid, password, profile)
+			@debug_notes = ""
 			@userid = userid
 			@password = password
 			@profile = profile
@@ -39,6 +39,7 @@ module EDSApi
 			req["Content-Type"] = "application/xml"
 			req["Accept"] = "application/json" #if format == :json
 			req.body = xml
+			@debug_notes << "<p>UID Authentication Call to " << uri.to_s << ": " << xml << "</p>";
 			https = Net::HTTP.new(uri.hostname, uri.port)
 			https.use_ssl = true
 			https.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -73,6 +74,7 @@ module EDSApi
 			req = Net::HTTP::Get.new(uri.request_uri)
 			req['x-authenticationToken'] = @auth_token
 			req['Accept'] = "application/json"
+			@debug_notes << "<p>CREATE SESSION Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << "</p>";
 #			Net::HTTP.start(uri.hostname, uri.port) { |http|
 #  			doc = JSON.parse(http.request(req).body)
 #				return doc['SessionToken']
@@ -107,6 +109,8 @@ module EDSApi
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
+			@debug_notes << "<p>SEARCH Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
+
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
   			begin
 			  return http.request(req).body
@@ -125,6 +129,8 @@ module EDSApi
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
+			@debug_notes << "<p>RETRIEVE Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
+
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
   			begin
 			  return http.request(req).body
@@ -140,6 +146,7 @@ module EDSApi
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
+			@debug_notes << "<p>INFO Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
   			begin
 			  return http.request(req).body
@@ -177,31 +184,35 @@ module EDSApi
 			@session_token = session_token
 			@auth_token = auth_token
 			loop do
-			  result = JSON.parse(super(options, format))
-			  if result.has_key?('ErrorNumber')
-				  case result['ErrorNumber']
-				  	when "108"
-				  		@session_token = self.create_session
-				  		result = JSON.parse(super(options, format))
-				  	when "109"
-				  		@session_token = self.create_session
-				  		result = JSON.parse(super(options, format))
-				  	when "104"
-				  		self.uid_authenticate(:json)
-				  		result = JSON.parse(super(options, format))
-					when "107"
-						self.uid_authenticate(:json)
-				  		result = JSON.parse(super(options, format))
-					else
-						return result	
-				  end
-				  attempts += 1
-				  if attempts >= @max_retries
-				  	return result
-				  end
-			  else
-			  	return result
-			  end
+				result = JSON.parse(super(options, format))
+				if result.has_key?('ErrorNumber')
+					@debug_notes << "<p>Found ERROR " << result['ErrorNumber'].to_s
+					case result['ErrorNumber']
+					      when "108"
+						      @session_token = self.create_session
+						      result = JSON.parse(super(options, format))
+					      when "109"
+						      @session_token = self.create_session
+						      result = JSON.parse(super(options, format))
+					      when "104"
+						      self.uid_authenticate(:json)
+						      result = JSON.parse(super(options, format))
+					      when "107"
+						      self.uid_authenticate(:json)
+						      result = JSON.parse(super(options, format))
+					      else
+						      return result	
+					end
+					unless result.has_key?('ErrorNumber')
+						return result
+					end
+					attempts += 1
+					if attempts >= @max_retries
+					      return result
+					end
+				else
+				      return result
+				end
 			end
 		end
 	        def info (session_token, auth_token, format= :xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-discovery-service-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Set of Ruby functions to interface with the EBSCO Discovery Service API.
 email: eds@ebscohost.com