diff --git a/app/assets/stylesheets/sticky-footer.css b/app/assets/stylesheets/sticky-footer.css new file mode 100644 index 000000000..fc73bcc8c --- /dev/null +++ b/app/assets/stylesheets/sticky-footer.css @@ -0,0 +1,16 @@ +/* CSS for sticky footers*/ +* { + margin: 0; +} +html, body { + height: 100%; +} +.wrapper { + min-height: 100%; + height: auto !important; /* This line and the next line are not necessary unless you need IE6 support */ + height: 100%; + margin: 0 auto -180px; /* the bottom margin is the negative value of the footer's height */ +} +.footer, .push { + height: 180px; /* .push must be the same height as .footer */ +} diff --git a/app/assets/stylesheets/ualib-custom.scss b/app/assets/stylesheets/ualib-custom.scss index e56b3135d..87378c2a0 100644 --- a/app/assets/stylesheets/ualib-custom.scss +++ b/app/assets/stylesheets/ualib-custom.scss @@ -1,21 +1,3 @@ -/* CSS for sticky footers*/ -* { - margin: 0; -} -html, body { - height: 100%; -} -.wrapper { - min-height: 100%; - height: auto !important; /* This line and the next line are not necessary unless you need IE6 support */ - height: 100%; - margin: 0 auto -180px; /* the bottom margin is the negative value of the footer's height */ -} -.footer, .push { - height: 180px; /* .push must be the same height as .footer */ -} - - /*used to create 5 column layout - from http://www.wearesicc.com/quick-tips-5-column-layout-with-twitter-bootstrap/ */ .col-xs-15, @@ -860,7 +842,7 @@ display: block; font-size: 12px; padding: 4px 15px 2px 15px; } -.news-stories li a:hover{ +.news-stories li:hover{ background-color: #e8eff3; } .news-stories>a{ diff --git a/app/helpers/blacklight/articles_helper_behavior.rb b/app/helpers/blacklight/articles_helper_behavior.rb index 6ddd3bfe0..6be2ed4b9 100755 --- a/app/helpers/blacklight/articles_helper_behavior.rb +++ b/app/helpers/blacklight/articles_helper_behavior.rb @@ -16,7 +16,6 @@ # limitations under the License. module Blacklight::ArticlesHelperBehavior - ############ # Utility functions and libraries ############ @@ -70,7 +69,7 @@ def eds_connect session[:debugNotes] = "" # creates EDS API connection object, initializing it with application login credentials - @connection = EDSApi::ConnectionHandler.new(2) + @connection = ConnectionHandler.new(2) File.open(auth_file_location,"r") {|f| @api_userid = f.readline.strip @api_password = f.readline.strip @@ -1468,4 +1467,293 @@ def debugNotes #return session[:debugNotes] << "

API Calls

" << @connection.debug_notes end + API_URL = "http://eds-api.ebscohost.com/" + API_URL_S = "https://eds-api.ebscohost.com/" + + # 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, :debug_notes, :guest + attr_writer :userid, :password + + # Init the object with userid and pass. + def uid_init(userid, password, profile, guest = 'y') + #@debug_notes = "

Setting guest as " << guest.to_s << "

" + @userid = userid + @password = password + @profile = profile + @guest = guest + return self + end + def ip_init(profile, guest = 'y') + @profile = profile + @guest = guest + return self + end + # Auth with the server. Currently only uid auth is supported. + + ### + def uid_authenticate(format = :xml) + # DO NOT SEND CALL IF YOU HAVE A VALID AUTH TOKEN + xml = "#{@userid}#{@password}" + uri = URI "#{API_URL_S}authservice/rest/uidauth" + req = Net::HTTP::Post.new(uri.request_uri) + req["Content-Type"] = "application/xml" + req["Accept"] = "application/json" #if format == :json + req.body = xml + #@debug_notes << "

UID Authentication Call to " << uri.to_s << ": " << xml << "

"; + https = Net::HTTP.new(uri.hostname, uri.port) + https.use_ssl = true + https.verify_mode = OpenSSL::SSL::VERIFY_NONE + begin + doc = JSON.parse(https.request(req).body) + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + about "No response from server" + end + if doc.has_key?('ErrorNumber') + abort "Bad response from server - error code #{result['ErrorNumber']}" + else + @auth_token = doc['AuthToken'] + end + end + def ip_authenticate(format = :xml) + uri = URI "#{API_URL_S}authservice/rest/ipauth" + req = Net::HTTP::Post.new(uri.request_uri) + req["Accept"] = "application/json" #if format == :json + https = Net::HTTP.new(uri.hostname, uri.port) + https.use_ssl = true + https.verify_mode = OpenSSL::SSL::VERIFY_NONE + begin + doc = JSON.parse(https.request(req).body) + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + @auth_token = doc['AuthToken'] + end + # Create the session + def create_session + uri = URI "#{API_URL}edsapi/rest/createsession?profile=#{@profile}&guest=#{@guest}" + req = Net::HTTP::Get.new(uri.request_uri) + #req['x-authenticationToken'] = @auth_token + req['Accept'] = "application/json" + #@debug_notes << "

CREATE SESSION Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << "

"; +# Net::HTTP.start(uri.hostname, uri.port) { |http| +# doc = JSON.parse(http.request(req).body) +# return doc['SessionToken'] +# } + Net::HTTP.start(uri.hostname, uri.port) { |http| + begin + return http.request(req).body + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + } + end + # End the session + def end_session(session_token) + uri = URI "#{API_URL}edsapi/rest/endsession?sessiontoken=#{CGI::escape(session_token)}" + req = Net::HTTP::Get.new(uri.request_uri) + req['x-authenticationToken'] = @auth_token + Net::HTTP.start(uri.hostname, uri.port) { |http| + begin + http.request(req) + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + } + return true + end + # Run a search query, XML results are returned + def search(options, format = :xml) + uri = URI "#{API_URL}edsapi/rest/Search?#{options}" + #return uri.request_uri + req = Net::HTTP::Get.new(uri.request_uri) + req['x-authenticationToken'] = @auth_token + req['x-sessionToken'] = @session_token + req['Accept'] = 'application/json' #if format == :json + #@debug_notes << "

SEARCH Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; + + Net::HTTP.start(uri.hostname, uri.port) { |http| + begin + return http.request(req).body + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + } + end + # Retrieve specific information + def retrieve(dbid, an, highlightterms = "", format = :xml) + uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}" + if highlightterms != "" + uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}&highlightterms=#{highlightterms}" + end + req = Net::HTTP::Get.new(uri.request_uri) + req['x-authenticationToken'] = @auth_token + req['x-sessionToken'] = @session_token + req['Accept'] = 'application/json' #if format == :json + #@debug_notes << "

RETRIEVE Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; + + Net::HTTP.start(uri.hostname, uri.port) { |http| + begin + return http.request(req).body + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + } + end + # Info method + def info(format = :xml) + uri = URI "#{API_URL}edsapi/rest/Info" + req = Net::HTTP::Get.new(uri.request_uri) + req['x-authenticationToken'] = @auth_token + req['x-sessionToken'] = @session_token + req['Accept'] = 'application/json' #if format == :json + #@debug_notes << "

INFO Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; + Net::HTTP.start(uri.hostname, uri.port) { |http| + begin + return http.request(req).body + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e + abort "No response from server" + end + } + end + end + # Handles connections - retries failed connections, passes commands along + class ConnectionHandler < Connection + attr_accessor :max_retries + attr_accessor :session_token + def initialize(max_retries = 2) + @max_retries = max_retries + end + def show_session_token + return @session_token + end + def show_auth_token + return @auth_token + end + # def create_session(auth_token = @auth_token, format = :xml) + # @auth_token = auth_token + # result = JSON.parse(super()) + # if result.has_key?('ErrorNumber') + # return result.to_s + # else + # @session_token = result['SessionToken'] + # return result['SessionToken'] + # end + # end + def create_session(format = :xml) + #@auth_token = auth_token + result = JSON.parse(super()) + @session_token = result['SessionToken'] + end + def search(options, session_token, auth_token, format = :xml) + attempts = 0 + @session_token = session_token + @auth_token = auth_token + loop do + result = JSON.parse(super(options, format)) + if result.has_key?('ErrorNumber') + #@debug_notes << "

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) + attempts = 0 + @auth_token = auth_token + @session_token = session_token + loop do + result = JSON.parse(super(format)) # JSON Parse + if result.has_key?('ErrorNumber') + case result['ErrorNumber'] + when "108" + @session_token = self.create_session + when "109" + @session_token = self.create_session + when "104" + self.uid_authenticate(:json) + when "107" + self.uid_authenticate(:json) + end + attempts += 1 + if attempts >= @max_retries + return result + end + else + return result + end + end + end + def retrieve(dbid, an, highlightterms, session_token, auth_token, format = :xml) + attempts = 0 + @session_token = session_token + @auth_token = auth_token + loop do + result = JSON.parse(super(dbid, an, highlightterms, format)) + if result.has_key?('ErrorNumber') + case result['ErrorNumber'] + when "108" + @session_token = self.create_session + when "109" + @session_token = self.create_session + when "104" + self.uid_authenticate(:json) + when "107" + self.uid_authenticate(:json) + end + attempts += 1 + if attempts >= @max_retries + return result + end + else + return result + end + end + end + end + +# Benchmark response times +def benchmark(q = false) + start = Time.now + connection = ConnectionHandler.new(2) + connection.uid_init('USERID', 'PASSWORD', 'PROFILEID') + connection.uid_authenticate(:json) + puts((start - Time.now).abs) unless q + connection.create_session + puts((start - Time.now).abs) unless q + connection.search('query-1=AND,galapagos+hawk', :json) + puts((start - Time.now).abs) unless q + connection.end_session + puts((start - Time.now).abs) unless q +end + +# Run benchmark with warm up run; only if file was called directly and not required +# if __FILE__ == $0 +# benchmark(true) +# benchmark +# end end diff --git a/app/helpers/blacklight/articles_helper_behavior/eds_api.rb b/app/helpers/blacklight/articles_helper_behavior/eds_api.rb deleted file mode 100755 index 4f6b3c216..000000000 --- a/app/helpers/blacklight/articles_helper_behavior/eds_api.rb +++ /dev/null @@ -1,299 +0,0 @@ -require 'net/http' -require 'cgi' -require 'json' - -# This is the first, barely tested pass at creating a set of Ruby functions to authenticate to, search, and retrieve from the EDS API. -# Once this gem is installed, you can find demo code that makes use of the gem here: -# http://www.lh2cc.net/dse/efrierson/ruby/eds-alpha-demo.zip - - module EDSApi - API_URL = "http://eds-api.ebscohost.com/" - API_URL_S = "https://eds-api.ebscohost.com/" - - # 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, :debug_notes, :guest - attr_writer :userid, :password - - # Init the object with userid and pass. - def uid_init(userid, password, profile, guest = 'y') - #@debug_notes = "

Setting guest as " << guest.to_s << "

" - @userid = userid - @password = password - @profile = profile - @guest = guest - return self - end - def ip_init(profile, guest = 'y') - @profile = profile - @guest = guest - return self - end - # Auth with the server. Currently only uid auth is supported. - - ### - def uid_authenticate(format = :xml) - # DO NOT SEND CALL IF YOU HAVE A VALID AUTH TOKEN - xml = "#{@userid}#{@password}" - uri = URI "#{API_URL_S}authservice/rest/uidauth" - req = Net::HTTP::Post.new(uri.request_uri) - req["Content-Type"] = "application/xml" - req["Accept"] = "application/json" #if format == :json - req.body = xml - #@debug_notes << "

UID Authentication Call to " << uri.to_s << ": " << xml << "

"; - https = Net::HTTP.new(uri.hostname, uri.port) - https.use_ssl = true - https.verify_mode = OpenSSL::SSL::VERIFY_NONE - begin - doc = JSON.parse(https.request(req).body) - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - about "No response from server" - end - if doc.has_key?('ErrorNumber') - abort "Bad response from server - error code #{result['ErrorNumber']}" - else - @auth_token = doc['AuthToken'] - end - end - def ip_authenticate(format = :xml) - uri = URI "#{API_URL_S}authservice/rest/ipauth" - req = Net::HTTP::Post.new(uri.request_uri) - req["Accept"] = "application/json" #if format == :json - https = Net::HTTP.new(uri.hostname, uri.port) - https.use_ssl = true - https.verify_mode = OpenSSL::SSL::VERIFY_NONE - begin - doc = JSON.parse(https.request(req).body) - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - @auth_token = doc['AuthToken'] - end - # Create the session - def create_session - uri = URI "#{API_URL}edsapi/rest/createsession?profile=#{@profile}&guest=#{@guest}" - req = Net::HTTP::Get.new(uri.request_uri) - #req['x-authenticationToken'] = @auth_token - req['Accept'] = "application/json" - #@debug_notes << "

CREATE SESSION Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << "

"; -# Net::HTTP.start(uri.hostname, uri.port) { |http| -# doc = JSON.parse(http.request(req).body) -# return doc['SessionToken'] -# } - Net::HTTP.start(uri.hostname, uri.port) { |http| - begin - return http.request(req).body - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - } - end - # End the session - def end_session(session_token) - uri = URI "#{API_URL}edsapi/rest/endsession?sessiontoken=#{CGI::escape(session_token)}" - req = Net::HTTP::Get.new(uri.request_uri) - req['x-authenticationToken'] = @auth_token - Net::HTTP.start(uri.hostname, uri.port) { |http| - begin - http.request(req) - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - } - return true - end - # Run a search query, XML results are returned - def search(options, format = :xml) - uri = URI "#{API_URL}edsapi/rest/Search?#{options}" - #return uri.request_uri - req = Net::HTTP::Get.new(uri.request_uri) - req['x-authenticationToken'] = @auth_token - req['x-sessionToken'] = @session_token - req['Accept'] = 'application/json' #if format == :json - #@debug_notes << "

SEARCH Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; - - Net::HTTP.start(uri.hostname, uri.port) { |http| - begin - return http.request(req).body - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - } - end - # Retrieve specific information - def retrieve(dbid, an, highlightterms = "", format = :xml) - uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}" - if highlightterms != "" - uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}&highlightterms=#{highlightterms}" - end - req = Net::HTTP::Get.new(uri.request_uri) - req['x-authenticationToken'] = @auth_token - req['x-sessionToken'] = @session_token - req['Accept'] = 'application/json' #if format == :json - #@debug_notes << "

RETRIEVE Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; - - Net::HTTP.start(uri.hostname, uri.port) { |http| - begin - return http.request(req).body - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - } - end - # Info method - def info(format = :xml) - uri = URI "#{API_URL}edsapi/rest/Info" - req = Net::HTTP::Get.new(uri.request_uri) - req['x-authenticationToken'] = @auth_token - req['x-sessionToken'] = @session_token - req['Accept'] = 'application/json' #if format == :json - #@debug_notes << "

INFO Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "

"; - Net::HTTP.start(uri.hostname, uri.port) { |http| - begin - return http.request(req).body - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e - abort "No response from server" - end - } - end - end - # Handles connections - retries failed connections, passes commands along - class ConnectionHandler < Connection - attr_accessor :max_retries - attr_accessor :session_token - def initialize(max_retries = 2) - @max_retries = max_retries - end - def show_session_token - return @session_token - end - def show_auth_token - return @auth_token - end - # def create_session(auth_token = @auth_token, format = :xml) - # @auth_token = auth_token - # result = JSON.parse(super()) - # if result.has_key?('ErrorNumber') - # return result.to_s - # else - # @session_token = result['SessionToken'] - # return result['SessionToken'] - # end - # end - def create_session(format = :xml) - #@auth_token = auth_token - result = JSON.parse(super()) - @session_token = result['SessionToken'] - end - def search(options, session_token, auth_token, format = :xml) - attempts = 0 - @session_token = session_token - @auth_token = auth_token - loop do - result = JSON.parse(super(options, format)) - if result.has_key?('ErrorNumber') - #@debug_notes << "

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) - attempts = 0 - @auth_token = auth_token - @session_token = session_token - loop do - result = JSON.parse(super(format)) # JSON Parse - if result.has_key?('ErrorNumber') - case result['ErrorNumber'] - when "108" - @session_token = self.create_session - when "109" - @session_token = self.create_session - when "104" - self.uid_authenticate(:json) - when "107" - self.uid_authenticate(:json) - end - attempts += 1 - if attempts >= @max_retries - return result - end - else - return result - end - end - end - def retrieve(dbid, an, highlightterms, session_token, auth_token, format = :xml) - attempts = 0 - @session_token = session_token - @auth_token = auth_token - loop do - result = JSON.parse(super(dbid, an, highlightterms, format)) - if result.has_key?('ErrorNumber') - case result['ErrorNumber'] - when "108" - @session_token = self.create_session - when "109" - @session_token = self.create_session - when "104" - self.uid_authenticate(:json) - when "107" - self.uid_authenticate(:json) - end - attempts += 1 - if attempts >= @max_retries - return result - end - else - return result - end - end - end - end -end - -# Benchmark response times -def benchmark(q = false) - start = Time.now - connection = EDSApi::ConnectionHandler.new(2) - connection.uid_init('USERID', 'PASSWORD', 'PROFILEID') - connection.uid_authenticate(:json) - puts((start - Time.now).abs) unless q - connection.create_session - puts((start - Time.now).abs) unless q - connection.search('query-1=AND,galapagos+hawk', :json) - puts((start - Time.now).abs) unless q - connection.end_session - puts((start - Time.now).abs) unless q -end - -# Run benchmark with warm up run; only if file was called directly and not required -if __FILE__ == $0 - benchmark(true) - benchmark -end diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index c22cbae48..d6f55aabb 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -53,36 +53,36 @@