diff --git a/.bundle/config b/.bundle/config index b81abe028..7544be9dd 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,3 +1,2 @@ --- -BUNDLE_PATH: vendor -BUNDLE_DISABLE_SHARED_GEMS: '1' +BUNDLE_FROZEN: '1' diff --git a/.gitignore b/.gitignore index f7c9fa9ea..1b6e09ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /tmp APIauthentication.txt /vendor +token.txt diff --git a/Gemfile b/Gemfile index bb631c96e..62c2056e8 100755 --- a/Gemfile +++ b/Gemfile @@ -48,3 +48,5 @@ gem "ebsco-discovery-service-api", "1.0.4" gem "addressable", "2.3.2" gem "htmlentities" gem "activerecord-session_store" + +gem "factory_girl", "~> 4.0", group: [:test, :development] diff --git a/Gemfile.lock b/Gemfile.lock index e5241f5f6..938a4196a 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,6 +71,8 @@ GEM ensure_valid_encoding (0.5.3) erubis (2.7.0) execjs (2.2.1) + factory_girl (4.4.0) + activesupport (>= 3.0.0) ffi (1.9.3) hike (1.2.3) htmlentities (4.3.2) @@ -184,6 +186,7 @@ DEPENDENCIES devise devise-guests (~> 0.3) ebsco-discovery-service-api (= 1.0.4) + factory_girl (~> 4.0) htmlentities jbuilder (~> 2.0) jettywrapper (~> 1.7) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3bb0f8664..b24368f26 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,4 +9,30 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + def after_sign_in_path_for(resource) + if session[:session_key].present? + connection = EDSApi::ConnectionHandler.new(2) + connection.end_session(session[:session_key]) + session[:session_key] = nil + end + if session[:results].present? + session[:results] = nil + end + if session[:current_url].present? + session[:current_url] + end + end + + def after_sign_out_path_for(resource) + if session[:session_key].present? + connection = EDSApi::ConnectionHandler.new(2) + connection.end_session(session[:session_key]) + session[:session_key] = nil + end + if session[:results].present? + session[:results] = nil + end + root_path + end end diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb new file mode 100755 index 000000000..ce96ac52c --- /dev/null +++ b/app/controllers/articles_controller.rb @@ -0,0 +1,9 @@ +# -*- encoding : utf-8 -*- +require 'blacklight/catalog' + +class ArticlesController < ApplicationController + #before_filter :authenticate_user! + + include Blacklight::Catalog + +end diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb new file mode 100755 index 000000000..8542a3703 --- /dev/null +++ b/app/helpers/articles_helper.rb @@ -0,0 +1,3 @@ +module ArticlesHelper + include Blacklight::ArticlesHelperBehavior +end diff --git a/app/helpers/blacklight/articles_helper_behavior.rb b/app/helpers/blacklight/articles_helper_behavior.rb new file mode 100755 index 000000000..62c471057 --- /dev/null +++ b/app/helpers/blacklight/articles_helper_behavior.rb @@ -0,0 +1,1465 @@ +# -*- encoding : utf-8 -*- + +## +# Copyright 2013 EBSCO Information Services +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Blacklight::ArticlesHelperBehavior + + ############ + # Utility functions and libraries + ############ + + require 'fileutils' # for interacting with files + require "addressable/uri" # for manipulating URLs in the interface + require "htmlentities" # for deconding/encoding URLs + require "cgi" + require 'open-uri' + + def html_unescape(text) + return CGI.unescape(text) + end + + def deep_clean(parameters) + tempArray = Array.new; + parameters.each do |k,v| + unless v.nil? + if v.is_a?(Array) + deeperClean = deep_clean(v) + parameters[k] = deeperClean + else + parameters[k] = h(v) + end + else + clean_key = h(k) + tempArray.push(clean_key) + end + end + unless tempArray.empty? + parameters = tempArray + end + return parameters + end + + # cleans response from EBSCO API + def processAPItags(apiString) + processed = HTMLEntities.new.decode apiString + return processed.html_safe + end + + ########### + # API Interaction + ########### + + # called at the beginning of every page load + def eds_connect + + # use session[:debugNotes] to store any debug text + # this will display if you render the _debug partial + session[:debugNotes] = "" + + # creates EDS API connection object, initializing it with application login credentials + @connection = EDSApi::ConnectionHandler.new(2) + File.open(auth_file_location,"r") {|f| + @api_userid = f.readline.strip + @api_password = f.readline.strip + @api_profile = f.readline.strip + } + if authenticated_user? + session[:debugNotes] << "

Sending NO as guest.

" + @connection.uid_init(@api_userid, @api_password, @api_profile, 'n') + else + session[:debugNotes] << "

Sending YES as guest.

" + @connection.uid_init(@api_userid, @api_password, @api_profile, 'y') + end + + # generate a new authentication token if their isn't one or the one stored on server is invalid or expired + if has_valid_auth_token? + @auth_token = getAuthToken + else + @connection.uid_authenticate(:json) + @auth_token = @connection.show_auth_token + writeAuthToken(@auth_token) + end + + # generate a new session key if there isn't one, or if the existing one is invalid + if session[:session_key].present? + if session[:session_key].include?('Error') + @session_key = @connection.create_session(@auth_token) + session[:session_key] = @session_key + get_info + else + @session_key = session[:session_key] + end + else + @session_key = @connection.create_session(@auth_token, 'n') + session[:session_key] = @session_key + get_info + end + + # at this point, we should have a valid authentication and session token + + end + + # after basic functions like SEARCH, INFO, and RETRIEVE, check to make sure a new session token wasn't generated + # if it was, use the new session key from here on out + def checkSessionCurrency + currentSessionKey = @connection.show_session_token + if currentSessionKey != get_session_key + session[:session_key] = currentSessionKey + @session_key = currentSessionKey + get_info + end + end + + # generates parameters for the API call given URL parameters + # options is usually the params hash + # this function strips out unneeded parameters and reformats them to form a string that the API accepts as input + def generate_api_query(options) + + #removing Rails and Blacklight parameters + options.delete("action") + options.delete("controller") + options.delete("utf8") + + #translate Blacklight search_field into query index + if options["search_field"].present? + if options["search_field"] == "author" + fieldcode = "AU:" + elsif options["search_field"] == "subject" + fieldcode = "SU:" + elsif options["search_field"] == "title" + fieldcode = "TI:" + else + fieldcode = "" + end + else + fieldcode = "" + end + + #should write something to allow this to be overridden + searchmode = "AND" + + #build 'query-1' API URL parameter + searchquery_extras = searchmode + "," + fieldcode + + #filter to make sure the only parameters put into the API query are those that are expected by the API + edsKeys = ["eds_action","q","query-1","facetfilter[]","facetfilter","sort","includefacets","searchmode","view","resultsperpage","sort","pagenumber","highlight", "limiter", "limiter[]"] + edsSubset = {} + options.each do |key,value| + if edsKeys.include?(key) + edsSubset[key] = value + end + end + + #rename parameters to expected names + #action and query-1 were renamed due to Rails and Blacklight conventions respectively + mappings = {"eds_action" => "action", "q" => "query-1"} + newoptions = Hash[edsSubset.map {|k, v| [mappings[k] || k, v] }] + + #repace the raw query, adding searchmode and fieldcode + changeQuery = newoptions["query-1"] + uri = Addressable::URI.new + uri.query_values = newoptions + searchquery = uri.query + searchtermindex = searchquery.index('query-1=') + 8 + searchquery.insert searchtermindex, searchquery_extras + + # , : ( ) - unencoding expected punctuation + searchquery = searchquery.gsub('%28','(').gsub('%3A',':').gsub('%29',')').gsub('%23',',') + return searchquery + end + + # main search function. accepts string to be tacked on to API endpoint URL + def search(apiquery) + results = @connection.search(apiquery, @session_key, @auth_token, :json).to_hash + + #update session_key if new one was generated in the call + checkSessionCurrency + + #results are stored in the session to facilitate faster navigation between detailed records and results list without needed a new API call + session[:results] = results + session[:apiquery] = apiquery + end + + def retrieve(dbid, an, highlight = "") + debugNotes << "HIGHLIGHTBEFORE:" << highlight.to_s + highlight.downcase! + highlight.gsub! ',and,',',' + highlight.gsub! ',or,',',' + highlight.gsub! ',not,',',' + debugNotes << "HIGHLIGHTAFTER: " << highlight.to_s + record = @connection.retrieve(dbid, an, highlight, @session_key, @auth_token, :json).to_hash + debugNotes << "RECORD: " << record.to_s + #update session_key if new one was generated in the call + checkSessionCurrency + + return record + end + + def termsToHighlight(terms = "") + if terms.present? + words = terms.split(/\W+/) + return words.join(",").to_s + else + return "" + end + end + + # helper function for iterating through results from + def switch_link(params,qurl) + + # check to see if the user is navigating to a record that was not included in the current page of results + # if so, run a new search API call, getting the appropriate page of results + if params[:resultId].to_i > (params[:pagenumber].to_i * params[:resultsperpage].to_i) + nextPage = params[:pagenumber].to_i + 1 + newParams = params + newParams[:eds_action] = "GoToPage(" + nextPage.to_s + ")" + options = generate_api_query(newParams) + search(options) + elsif params[:resultId].to_i < (((params[:pagenumber].to_i - 1) * params[:resultsperpage].to_i) + 1) + nextPage = params[:pagenumber].to_i - 1 + newParams = params + newParams[:eds_action] = "GoToPage(" + nextPage.to_s + ")" + options = generate_api_query(newParams) + search(options) + end + + link = "" + # generate the link for the target record + if session[:results]['SearchResult']['Data']['Records'].present? + session[:results]['SearchResult']['Data']['Records'].each do |result| + nextId = show_resultid(result).to_s + if nextId == params[:resultId].to_s + nextAn = show_an(result).to_s + nextDbId = show_dbid(result).to_s + nextrId = params[:resultId].to_s + nextHighlight = params[:q].to_s + link = request.fullpath.split("/switch")[0].to_s + "/" + nextDbId.to_s + "/" + nextAn.to_s + "/?resultId=" + nextrId.to_s + "&highlight=" + nextHighlight.to_s + end + end + end + return link.to_s + + end + + # calls the INFO API method + # counts how many limiters are available + def get_info + + numLimiters = 0 + session[:info] = @connection.info(@session_key, @auth_token, :json).to_hash + checkSessionCurrency + + if session[:info].present? + if session[:info]['AvailableSearchCriteria'].present? + if session[:info]['AvailableSearchCriteria']['AvailableLimiters'].present? + session[:info]['AvailableSearchCriteria']['AvailableLimiters'].each do |limiter| + if limiter["Type"] == "select" + numLimiters += 1 + end + end + end + end + end + + session[:numLimiters] = numLimiters + end + + ############ + # File / Token Handling / End User Auth + ############ + + def authenticated_user? + if user_signed_in? + return true + end + # need to define function for detecting on-campus IP ranges + return false + end + + def clear_session_key + session.delete(:session_key) + end + + def get_session_key + if session[:session_key].present? + return session[:session_key].to_s + else + return "no session key" + end + end + + def token_file_exists? + if File.exists?(token_file_location) + return true + end + return Rails.root.to_s + "/token.txt" + end + + def auth_file_exists? + if File.exists?(auth_file_location) + return true + end + return Rails.root.to_s + "/APIauthentication.txt" + end + + def token_file_location + if request.domain.to_s.include?("localhost") + return "token.txt" + end + return Rails.root.to_s + "/token.txt" + end + + def auth_file_location + if request.domain.to_s.include?("localhost") + return "APIauthentication.txt" + end + return Rails.root.to_s + "/APIauthentication.txt" + end + + # returns true if the authtoken stored in token.txt is valid + # false if otherwise + def has_valid_auth_token? + token = timeout = timestamp = '' + if token_file_exists? + File.open(token_file_location,"r") {|f| + if f.readlines.size <= 2 + return false + end + } + File.open(token_file_location,"r") {|f| + token = f.readline.strip + timeout = f.readline.strip + timestamp = f.readline.strip + } + else + return false + end + if Time.now.getutc.to_i < timestamp.to_i + return true + else + session[:debugNotes] << "

Looks like the auth token is out of date.. It expired at " << Time.at(timestamp.to_i).to_s << "

" + return false + end + end + + def get_token_timeout + timestamp = ''; + File.open(token_file_location,"r") {|f| + token = f.readline.strip + timeout = f.readline.strip + timestamp = f.readline.strip + } + return Time.at(timestamp.to_i) + end + + # writes an authentication token to token.txt. + # will create token.txt if it does not exist + def writeAuthToken(auth_token) + timeout = "1800" + timestamp = Time.now.getutc.to_i + timeout.to_i + timestamp = timestamp.to_s + auth_token = auth_token.to_s + + if File.exists?(token_file_location) + File.open(token_file_location,"w") {|f| + f.write(auth_token) + f.write("\n" + timeout) + f.write("\n" + timestamp) + } + else + File.new(token_file_location,"w") {|f| + f.write(auth_token) + f.write("\n" + timeout) + f.write("\n" + timestamp) + } + File.chmod(664,token_file_location) + File.open(token_file_location,"w") {|f| + f.write(auth_token) + f.write("\n" + timeout) + f.write("\n" + timestamp) + } + end + end + + def getAuthToken + token = '' + timeout = '' + timestamp = '' + if has_valid_auth_token? + File.open(token_file_location,"r") {|f| + token = f.readline.strip + } + return token + end + return token + end + + + ############ + # Linking Utilities + ############ + + # pulls from the results of the current search to serve as the baseURL for next request + def generate_next_url + if session[:results].present? + url = HTMLEntities.new.decode(session[:results]['SearchRequestGet']['QueryString']) + + #blacklight expects the search term to be in the parameter 'q'. + #q is moved back to 'query-1' in 'generate_api_query' + #should probably pull from Info method to determine replacement strings + #i could turn the query into a Hash, but available functions to do so delete duplicated params (Addressable) + url.gsub!("query-1=AND,TI:","q=") + url.gsub!("query-1=AND,AU:","q=") + url.gsub!("query-1=AND,SU:","q=") + url.gsub!("query-1=AND,","q=") + + #Rails framework doesn't allow repeated params. turning these into arrays fixes it. + url.gsub!("facetfilter=","facetfilter[]=") + url.gsub!("limiter=","limiter[]=") + + #i should probably pull this from the query, not the URL + if (params[:search_field]).present? + url << "&search_field=" << params[:search_field].to_s + end + return url + else + return '' + end + end + + # should replace this functionality with AddQuery/RemoveQuery actions + def generate_next_url_newvar_from_hash(variablehash) + uri = Addressable::URI.parse(request.fullpath.split("?")[0] + "?" + generate_next_url) + newUri = uri.query_values.merge variablehash + uri.query_values = newUri + return uri.query.to_s + end + + #for the search form at the top of results + #retains some of current search's fields (limiters) + #discards pagenumber, facets and filters, actions, etc. + def show_hidden_field_tags + hidden_fields = ""; + params.each do |key, value| + unless ((key == "search_field") or (key == "fromDetail") or (key == "facetfilter") or (key == "pagenumber") or (key == "q") or (key == "dbid") or (key == "an")) + if (key == "eds_action") + if ((value.scan(/addlimiter/).length > 0) or (value.scan(/removelimiter/).length > 0) or (value.scan(/setsort/).length > 0) or (value.scan(/SetResultsPerPage/).length > 0)) + hidden_fields << '' + end + elsif value.kind_of?(Array) + value.each do |arrayVal| + hidden_fields << '' + end + else + hidden_fields << '' + end + end + end + return hidden_fields.html_safe + end + + ########### + # Pagination + ########### + + #display how many results are being shown + def show_results_per_page + if params[:eds_action].present? + if params[:eds_action].to_s.scan(/SetResultsPerPage/).length > 0 + rpp = params[:eds_action].to_s.gsub("SetResultsPerPage(","").gsub(")","").to_i + return rpp + end + end + if params[:resultsperpage].present? + return params[:resultsperpage].to_i + end + return 20 + end + + #calculates total number of pages in results set + def show_total_pages + pages = show_total_hits / show_results_per_page + return pages + 1 + end + + #get current page, which serves as a base for most pagination functions + def show_current_page + if params[:eds_action].present? + if params[:eds_action].scan(/GoToPage/).length > 0 + pagenum = params[:eds_action].to_s + newpagenum = pagenum.gsub("GoToPage(","") + newpagenum = newpagenum.gsub(")","") + return newpagenum.to_i + elsif params[:eds_action].scan(/SetResultsPerPage/).length > 0 + if params[:pagenumber].present? + return params[:pagenumber].to_i + else + return 1 + end + else + return 1 + end + end + if params[:pagenumber].present? + return params[:pagenumber].to_i + end + return 1 + end + + #display pagination at the top of the results list + def show_compact_pagination + previous_link = '' + next_link = '' + first_result_on_page_num = ((show_current_page - 1) * show_results_per_page) + 1 + last_result_on_page_num = first_result_on_page_num + show_results_per_page - 1 + if last_result_on_page_num > show_total_hits + last_result_on_page_num = show_total_hits + end + page_info = "" + first_result_on_page_num.to_s + " - " + last_result_on_page_num.to_s + " of " + show_total_hits.to_s + "" + if show_current_page > 1 + previous_page = show_current_page - 1 + previous_link = '« Previous | ' + end + if (show_current_page * show_results_per_page) < show_total_hits + next_page = show_current_page + 1 + next_link = ' | Next »' + end + compact_pagination = previous_link + page_info + next_link + return compact_pagination.html_safe + end + + #bottom pagination. commented out lines remove 'last page' link, as this is not currently supported by the API + def show_pagination + previous_link = '' + next_link = '' + page_num_links = '' + + if show_current_page > 1 + previous_page = show_current_page - 1 + previous_link = '
  • « Previous
    • ' + else + previous_link = '
  • « Previous
    • ' + end + + if (show_current_page * show_results_per_page) < show_total_hits + next_page = show_current_page + 1 + next_link = '
  • Next »
    • ' + else + next_link = '
  • Next »
    • ' + end + + if show_current_page >= 4 + page_num_links << '
  • 1
    • ' + end + if show_current_page >= 5 + page_num_links << '
  • ...
    • ' + end + + # show links to the two pages the the left and right (where applicable) + bottom_page = show_current_page - 2 + if bottom_page <= 0 + bottom_page = 1 + end + top_page = show_current_page + 2 + if top_page >= show_total_pages + top_page = show_total_pages + end + (bottom_page..top_page).each do |i| + unless i == show_current_page + page_num_links << '
  • ' + i.to_s + '
    • ' + else + page_num_links << '
  • ' + i.to_s + '
    • ' + end + end + + if show_total_pages >= (show_current_page + 3) + page_num_links << '
  • ...
    • ' + end + + pagination_links = previous_link + next_link + page_num_links + return pagination_links.html_safe + end + + ############# + # Facet / Limiter Constraints Box + ############# + + # used when determining if the "constraints" partial should display + def query_has_facetfilters?(localized_params = params) + (generate_next_url.scan("facetfilter[]=").length > 0) or (generate_next_url.scan("limiter[]=").length > 0) + end + + # should probably return a hash and let the view handle the HTML + def show_applied_facets + appliedfacets = ''; + if session[:results]['SearchRequestGet']['SearchCriteriaWithActions']['FacetFiltersWithAction'].present? + session[:results]['SearchRequestGet']['SearchCriteriaWithActions']['FacetFiltersWithAction'].each do |appliedfacet| + appliedfacet.each do |key, val| + if key == "FacetValuesWithAction" + val.each do |facetValue| + appliedfacets << '' + facetValue['FacetValue']['Id'].to_s.gsub("EDS","").titleize + '' + facetValue['FacetValue']['Value'].to_s.titleize + 'Remove filter' + end + end + end + end + end + return appliedfacets.html_safe + end + + # should return hash and let the view handle the HTML + def show_applied_limiters + appliedlimiters = ''; + if session[:results].present? + if session[:results]['SearchRequestGet']['SearchCriteriaWithActions'].present? + if session[:results]['SearchRequestGet']['SearchCriteriaWithActions']['LimitersWithAction'].present? + session[:results]['SearchRequestGet']['SearchCriteriaWithActions']['LimitersWithAction'].each do |appliedLimiter| + limiterLabel = "No Label" + session[:info]['AvailableSearchCriteria']['AvailableLimiters'].each do |limiter| + if limiter["Id"] == appliedLimiter["Id"] + limiterLabel = limiter["Label"] + end + end + if appliedLimiter["Id"] == "DT1" + appliedLimiter["LimiterValuesWithAction"].each do |limiterValues| + appliedlimiters << '' + limiterLabel.to_s.titleize + '' + limiterValues["Value"].gsub("-01/"," to ").gsub("-12","") + 'Remove limiter' + end + else + appliedlimiters << '' + limiterLabel.to_s.titleize + 'Remove limiter' + end + end + end + end + end + return appliedlimiters.html_safe + end + + ############# + # Facets / Limiters sidebar + ############# + + # check to see if result has any facets. crude, and I forget why I had to do a length check.. + def has_eds_facets? + (show_facets.length > 5) + end + + def show_numlimiters + unless session[:numLimiters].present? + get_info + end + return session[:numLimiters] + end + + # show limiters on the view + def show_limiters + limiterCount = 0; + limitershtml = ''; + unless session[:info].present? + get_info + end + if session[:info]['AvailableSearchCriteria']['AvailableLimiters'].present? + limitershtml << '
    ' + return limitershtml.html_safe + else + return session[:info].to_s + end + end + + def show_date_options + dateString = "" + timeObj = Time.new + currentYear = timeObj.year + fiveYearsPrior = currentYear - 5 + tenYearsPrior = currentYear - 10 + dateString << '
    Date
    ' + return dateString.html_safe + end + + # show available facets + def show_facets + facets = ''; + if session[:results]['SearchResult']['AvailableFacets'].present? + session[:results]['SearchResult']['AvailableFacets'].each do |facet| + facets = facets + '
    ' + facet['Label'] + '
    ' + end + end + return facets.html_safe + end + + + ############# + # Sort / Display / Record Count + ############# + + # pull sort options from INFO method + def show_sort_options + sortDropdown = ""; + if session[:info]['AvailableSearchCriteria']['AvailableSorts'].present? + session[:info]['AvailableSearchCriteria']['AvailableSorts'].each do |sortOption| + sortDropdown << '
  • ' << sortOption["Label"].to_s << '
    • ' + end + end + return sortDropdown.html_safe + end + + # shows currently selected view + def show_view_option + uri = Addressable::URI.parse(request.fullpath.split("?")[0] + "?" + generate_next_url) + newUri = uri.query_values + if newUri['view'].present? + view_option = newUri['view'].to_s + else + view_option = "detailed" + end + return view_option + end + + # shows currently selected sort + def show_current_sort + allsorts = ''; + if params[:eds_action].present? + if params[:eds_action].to_s.scan(/setsort/).length > 0 + currentSort = params[:eds_action].to_s.gsub("setsort(","").gsub(")","") + if session[:info]['AvailableSearchCriteria']['AvailableSorts'].present? + session[:info]['AvailableSearchCriteria']['AvailableSorts'].each do |sortOption| + if sortOption['Id'] == currentSort + return "Sort by " << sortOption["Label"] + end + end + end + end + end + if params[:sort].present? + if session[:info]['AvailableSearchCriteria']['AvailableSorts'].present? + session[:info]['AvailableSearchCriteria']['AvailableSorts'].each do |sortOption| + if sortOption['Id'].to_s == params[:sort].to_s + return "Sort by " << sortOption["Label"] + end + end + end + end + return 'Sort by Relevance' + end + + ############### + # Results List + ############### + + def has_restricted_access?(result) + if result['Header']['AccessLevel'].present? + if result['Header']['AccessLevel'] == '1' + return true + end + end + return false + end + + def show_total_hits + return session[:results]['SearchResult']['Statistics']['TotalHits'] + end + + # see if title is available given a single result + def has_titlesource?(result) + if result['Items'].present? + result['Items'].each do |item| + if item['Group'].downcase == "src" + return true + end + end + end + return false + end + + # display title given a single result + def show_titlesource(result) + source = '' + flag = 0 + if result['Items'].present? + result['Items'].each do |item| + if item['Group'].downcase == "src" and flag == 0 + source = processAPItags(item['Data'].to_s) + flag = 1 + end + end + end + return source.html_safe + end + + def has_subjects?(result) + + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibEntity'].present? + if result['RecordInfo']['BibRecord']['BibEntity']['Subjects'].present? + if result['RecordInfo']['BibRecord']['BibEntity']['Subjects'].count > 0 + return true + end + end + end + end + end + return false + end + + def show_subjects(result) + # need to update this to look in granular data fields + + subject_array = [] + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibEntity'].present? + if result['RecordInfo']['BibRecord']['BibEntity']['Subjects'].present? + result['RecordInfo']['BibRecord']['BibEntity']['Subjects'].each do |subject| + if subject['SubjectFull'] + url_vars = {"q" => '"' + subject['SubjectFull'].to_s + '"', "search_field" => "subject"} + link2 = generate_next_url_newvar_from_hash(url_vars) << "&eds_action=GoToPage(1)" + if params[:dbid].present? + subject_link = '' + subject['SubjectFull'].to_s + '' + else + subject_link = '' + subject['SubjectFull'].to_s + '' + end + subject_array.push(subject_link) + end + end + end + end + end + end + subject_string = '' + subject_string = subject_array.join(", ") + return subject_string.html_safe + end + + def has_pubdate?(result) + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibRelationships'].present? + if result['RecordInfo']['BibRecord']['BibRelationships']['IsPartOfRelationships'].present? + result['RecordInfo']['BibRecord']['BibRelationships']['IsPartOfRelationships'].each do |isPartOfRelationship| + if isPartOfRelationship['BibEntity'].present? + if isPartOfRelationship['BibEntity']['Dates'].present? + isPartOfRelationship['BibEntity']['Dates'].each do |date| + if date['Type'] == "published" + return true + end + end + end + end + end + end + end + end + end + return false + end + + def show_pubdate(result) + # check to see if there is a PubDate ITEM + # Wiki Page on ITEM GROUPS + flag = 0 + pubdate = '' + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibRelationships'].present? + if result['RecordInfo']['BibRecord']['BibRelationships']['IsPartOfRelationships'].present? + result['RecordInfo']['BibRecord']['BibRelationships']['IsPartOfRelationships'].each do |isPartOfRelationship| + if isPartOfRelationship['BibEntity'].present? + if isPartOfRelationship['BibEntity']['Dates'].present? + isPartOfRelationship['BibEntity']['Dates'].each do |date| + if date['Type'] == "published" and flag == 0 + flag = 1 + if date['M'].present? and date['D'].present? and date['Y'].present? + pubdate << date['M'] << "/" << date['D'] << "/" << date['Y'] + elsif date['M'].present? and date['Y'].present? + pubdate << date['M'] << "/" << date['Y'] + elsif date['Y'].present? + pubdate << date['Y'] + else + pubdate << "Not available." + end + end + end + end + end + end + end + end + end + end + return pubdate + end + + def has_pubtype?(result) + return result['Header']['PubType'].present? + end + + def show_pubtype(result) + if has_pubtype?(result) + return result['Header']['PubType'] + end + return '' + end + + def has_pubtypeid?(result) + return result['Header']['PubTypeId'].present? + end + + def show_pubtypeid(result) + if has_pubtypeid?(result) + return result['Header']['PubTypeId'] + end + return '' + end + + def has_coverimage?(result) + if result['ImageInfo'].present? + result['ImageInfo'].each do |coverArt| + if coverArt['Size'] == 'thumb' + return true + end + end + end + return false + end + + def show_coverimage_link(result) + artUrl = '' + flag = 0 + if result['ImageInfo'].present? + result['ImageInfo'].each do |coverArt| + if coverArt['Size'] == 'thumb' and flag == 0 + artUrl << coverArt['Target'] + flag = 1 + end + end + end + return artUrl + end + + def has_abstract?(result) + if result['Items'].present? + result['Items'].each do |item| + if item['Group'].present? + if item['Group'] == "Ab" + return true + end + end + end + end + return false + end + + def show_abstract(result) + abstractString = '' + if result['Items'].present? + result['Items'].each do |item| + if item['Group'].present? + if item['Group'] == "Ab" + abstractString << item['Data'] + end + end + end + end + abstract = HTMLEntities.new.decode abstractString + return abstract.html_safe + end + + def has_authors?(result) + if result['Items'].present? + result['Items'].each do |item| + if item['Group'].present? + if item['Group'] == "Au" + return true + end + end + end + end + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibRelationships'].present? + if result['RecordInfo']['BibRecord']['BibRelationships']['HasContributorRelationships'].present? + result['RecordInfo']['BibRecord']['BibRelationships']['HasContributorRelationships'].each do |contributor| + if contributor['PersonEntity'].present? + return true + end + end + end + end + end + end + return false + end + + # this should make use of AddQuery / RemoveQuery - but there might be a conflict with the "q" variable + def show_authors(result) + author_array = [] + if result['Items'].present? + flag = 0 + authorString = [] + result['Items'].each do |item| + if item['Group'].present? + if item['Group'] == "Au" + # let Don and Michelle know what this cleaner function does + newAuthor = processAPItags(item['Data'].to_s) + # i'm duplicating the semicolor - fix + newAuthor.gsub!("
    ","; ") + authorString.push(newAuthor) + flag = 1 + end + end + end + if flag == 1 + return authorString.join("; ").html_safe + end + end + + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibRelationships'].present? + if result['RecordInfo']['BibRecord']['BibRelationships']['HasContributorRelationships'].present? + result['RecordInfo']['BibRecord']['BibRelationships']['HasContributorRelationships'].each do |contributor| + if contributor['PersonEntity'].present? + if contributor['PersonEntity']['Name'].present? + if contributor['PersonEntity']['Name']['NameFull'].present? + url_vars = {"q" => '"' + contributor['PersonEntity']['Name']['NameFull'].gsub(",","").gsub("%2C","").to_s + '"', "search_field" => "author"} + link2 = generate_next_url_newvar_from_hash(url_vars) + author_link = '' + contributor['PersonEntity']['Name']['NameFull'].to_s + '' + author_array.push(author_link) + end + end + end + end + return author_array.join("; ").html_safe + end + end + end + end + return '' + end + + def show_resultid(result) + return result['ResultId'].to_s + end + + def show_title(result) + result['Items'].each do |item| + if item['Group'] == 'Ti' + return HTMLEntities.new.decode(item['Data']).html_safe + end + end + titles = [] + if result['RecordInfo'].present? + if result['RecordInfo']['BibRecord'].present? + if result['RecordInfo']['BibRecord']['BibEntity'].present? + if result['RecordInfo']['BibRecord']['BibEntity']['Titles'].present? + result['RecordInfo']['BibRecord']['BibEntity']['Titles'].each do |title| + titles.push title['TitleFull'].to_s + end + end + end + end + return titles.join(" / ").html_safe + end + return "Title not available." + end + + def show_results_array + @results.inspect + end + + def has_full_text_on_screen?(result) + if result['FullText'].present? + if result['FullText']['Text'].present? + if result['FullText']['Text']['Availability'].present? + if result['FullText']['Text']['Availability'] == "1" + return true + end + end + end + end + end + + def show_full_text_on_screen(result) + if result['FullText'].present? + if result['FullText']['Text'].present? + if result['FullText']['Text']['Availability'].present? + if result['FullText']['Text']['Availability'] == "1" + return HTMLEntities.new.decode(result['FullText']['Text']['Value']) + end + end + end + end + end + + ################ + # Full Text Links + ################ + + def has_any_fulltext?(result) + if has_pdf?(result) + return true + elsif has_html?(result) + return true + elsif has_smartlink?(result) + return true + elsif has_fulltext?(result) + return true + elsif has_ebook?(result) + return true + end + return false + end + + def show_an(result) + if result['Header'].present? + if result['Header']['An'].present? + an = result['Header']['An'].to_s + end + end + return an + end + + def show_dbid(result) + if result['Header'].present? + if result['Header']['DbId'].present? + dbid = result['Header']['DbId'].to_s + end + end + return dbid + end + + def show_detail_link(result, resultId = "0", highlight = "") + link = "" + highlight.gsub! '"', '%22' + if result['Header'].present? + if result['Header']['DbId'].present? + if result['Header']['An'].present? + link << 'articles/' << result['Header']['DbId'].to_s << '/' << url_encode(result['Header']['An']) << '/' + if resultId.to_i > "0".to_i and highlight != "" + link << '?resultId=' << resultId.to_s << '&highlight=' << highlight.to_s + elsif resultId.to_i > "0".to_i + link << '?resultId=' << resultId.to_s + elsif highlight != "" + link << '?highlight' << highlight.to_s + end + end + end + end + return link + end + + def show_best_fulltext_link(result) + if has_pdf?(result) + return show_pdf_title_link(result) + elsif has_html?(result) + return show_detail_link(result) + elsif has_smartlink?(result) + return show_smartlink_title_link(result) + elsif has_fulltext?(result) + return best_customlink(result) + end + return '' + end + + # generate full text link for the detailed record area (not the title link) + def show_best_fulltext_link_detail(result) + if has_pdf?(result) + link = 'PDF Full Text' + elsif has_html?(result) + link = 'HTML Full Text' + elsif has_smartlink?(result) + link = 'Linked Full Text' + elsif has_fulltext?(result) + link = best_customlink_detail(result) + else + link = '' + end + return link.html_safe + end + + def has_pdf?(result) + if result['FullText'].present? + if result['FullText']['Links'].present? + result['FullText']['Links'].each do |link| + if link['Type'] == "pdflink" + return true + end + end + end + end + return false + end + + def has_html?(result) + if result['FullText'].present? + if result['FullText']['Text'].present? + if result['FullText']['Text']['Availability'].present? + if result['FullText']['Text']['Availability'].to_s == "1" + return true + end + end + end + end + return false + end + + def has_fulltext?(result) + if result['FullText'].present? + if result['FullText']['CustomLinks'].present? + result['FullText']['CustomLinks'].each do |customLink| + if customLink['Category'] == "fullText" + return true + end + end + end + end + return false + end + + def has_smartlink?(result) + if result['FullText'].present? + if result['FullText']['Links'].present? + result['FullText']['Links'].each do |smartLink| + if smartLink['Type'] == "other" + return true + end + end + end + end + return false + end + + def has_ebook?(result) + if result['FullText'].present? + if result['FullText']['Links'].present? + result['FullText']['Links'].each do |smartLink| + if smartLink['Type'] == "ebook-pdf" + return true + elsif smartLink['Type'] == "ebook-epub" + return true + end + end + end + end + return false + end + + def show_plink(result) + plink = '' + if result['PLink'].present? + plink << result['PLink'] + end + return plink + end + + def show_pdf_title_link(result) + title_pdf_link = '' + if result['Header']['DbId'].present? and result['Header']['An'].present? + title_pdf_link << request.fullpath.split("?")[0] << "/" << result['Header']['DbId'].to_s << "/" << result['Header']['An'].to_s << "/fulltext" + end + new_link = Addressable::URI.unencode(title_pdf_link.to_s) + return new_link + end + + def show_smartlink_title_link(result) + title_pdf_link = '' + if result['Header']['DbId'].present? and result['Header']['An'].present? + title_pdf_link << request.fullpath.split("?")[0] << "/" << result['Header']['DbId'].to_s << "/" << result['Header']['An'].to_s << "/fulltext" + end + new_link = Addressable::URI.unencode(title_pdf_link.to_s) + return new_link + end + + def show_ebook_title_link(result) + title_pdf_link = '' + if result['Header']['DbId'].present? and result['Header']['An'].present? + title_pdf_link << request.fullpath.split("?")[0] << "/" << result['Header']['DbId'].to_s << "/" << result['Header']['An'].to_s << "/fulltext" + end + new_link = Addressable::URI.unencode(title_pdf_link.to_s) + return new_link + end + + def show_pdf_link(record) + pdf_link = '' + if record['FullText'].present? + if record['FullText']['Links'].present? + record['FullText']['Links'].each do |link| + if link['Type'] == "pdflink" + pdf_link << link['Url'] + end + end + end + end + return pdf_link + end + + def show_smartlink(record) + pdf_link = '' + if record['FullText'].present? + if record['FullText']['Links'].present? + record['FullText']['Links'].each do |link| + if link['Type'] == "other" + pdf_link << link['Url'] + end + end + end + end + return pdf_link + end + + def show_ebook_link(record) + pdf_link = '' + if record['FullText'].present? + if record['FullText']['Links'].present? + record['FullText']['Links'].each do |link| + if link['Type'] == "ebook-pdf" + pdf_link << link['Url'] + elsif link['Type'] == "ebook-epub" + pdf_link << link['Url'] + end + end + end + end + return pdf_link + end + + def show_fulltext(result) + fulltext_links = [] + if result['FullText'].present? + if result['FullText']['CustomLinks'].present? + result['FullText']['CustomLinks'].each do |customLink| + if customLink['Category'] == "fullText" and customLink['Text'].present? + fulltext_links << '' + customLink['Text'] + '' + elsif customLink['Category'] == "fullText" + fulltext_links << 'Full Text via CustomLink' + customLink.to_s + ' ' + end + end + end + end + return fulltext_links.join(", ").html_safe + end + + # show prioritized custom links + def best_customlink(result) + fulltext_links = '' + flag = 0 + if result['FullText'].present? + if result['FullText']['CustomLinks'].present? + result['FullText']['CustomLinks'].each do |customLink| + if customLink['Category'] == "fullText" and flag == 0 + fulltext_links << customLink['Url'] + flag = 1 + end + end + end + end + return fulltext_links + end + + def best_customlink_detail(result) + fulltext_links = '' + flag = 0 + if result['FullText'].present? + if result['FullText']['CustomLinks'].present? + result['FullText']['CustomLinks'].each do |customLink| + if customLink['Category'] == "fullText" and flag == 0 and customLink['Text'].present? and customLink['Icon'].present? + fulltext_links << '' + customLink['Text'] + '' + flag = 1 + elsif customLink['Category'] == "fullText" and flag == 0 and customLink['Text'].present? + flag = 1 + fulltext_links << '' + customLink['Text'] + '' + elsif customLink['Category'] == "fullText" and flag == 0 and customLink['Icon'].present? + fulltext_links << '' + flag = 1 + elsif customLink['Category'] == "fullText" and flag == 0 + fulltext_links << 'Full Text via Custom Link' + flag = 1 + end + end + end + end + return fulltext_links + end + + def has_ill?(result) + if result['CustomLinks'].present? + result['CustomLinks'].each do |customLink| + if customLink['Category'] == "ill" + return true + end + end + end + return false + end + + def show_ill(result) + fulltext_links = '' + if result['CustomLinks'].present? + result['CustomLinks'].each do |customLink| + if customLink['Category'] == "ill" + fulltext_links << 'Request via Interlibrary Loan ' + end + end + end + return fulltext_links.html_safe + end + + ################ + # Debug Functions + ################ + + def show_query_string + return session[:results]['queryString'] + end + + def debugNotes + return session[:debugNotes] << "

    API Calls

    " << @connection.debug_notes + end + +end \ No newline at end of file diff --git a/app/views/articles/_debug.html.erb b/app/views/articles/_debug.html.erb index 6c204d0fa..33a51af8c 100755 --- a/app/views/articles/_debug.html.erb +++ b/app/views/articles/_debug.html.erb @@ -1,5 +1,6 @@

    Debug

    +
    Time of test: <%= Time.now.getutc.to_i.to_s %>, or <%= Time.at(Time.now.getutc.to_i) %>
    Token / Session Key Info

    Auth_Token: <%= getAuthToken %> <% if has_valid_auth_token? %> @@ -9,4 +10,6 @@

    Session_Token: <%= session[:session_key] %>

    Debug Notes

    Notes: <%= debugNotes.html_safe %>

    +
    Session Dump
    +

    <%= session.to_s %>

    \ No newline at end of file diff --git a/app/views/articles/_home.html.erb b/app/views/articles/_home.html.erb index 24b40a335..24a75be86 100755 --- a/app/views/articles/_home.html.erb +++ b/app/views/articles/_home.html.erb @@ -1,6 +1,6 @@ <% #Search form can be added here, defaulted to the navbar for Bootstrap version -%> <%= render :partial=>'home_text' %> -<% sidebar_items << capture do %> +<%# sidebar_items << capture do %> -<% end %> +<%# end %> diff --git a/app/views/articles/_previous_next_doc.html.erb b/app/views/articles/_previous_next_doc.html.erb index d0007a52f..e1f83e52b 100755 --- a/app/views/articles/_previous_next_doc.html.erb +++ b/app/views/articles/_previous_next_doc.html.erb @@ -1,12 +1,12 @@ <%#Using the Bootstrap Pagination class -%>
    <% if params[:resultId].present? and session[:results].present? %> -<% if params[:resultId] != "1" %> +<% if params[:resultId] != "1" and authenticated_user? %> <% prevId = params[:resultId].to_i - 1 %> <%= link_to "Previous", request.fullpath.split("/" + params[:dbid])[0] + "/switch/?" + generate_next_url + "&resultId=" + prevId.to_s %> | <% end %> Result <%= params[:resultId].to_s %> of <%= show_total_hits %> - <% if params[:resultId].to_i < show_total_hits.to_i %> + <% if params[:resultId].to_i < show_total_hits.to_i and authenticated_user? %> <% nextId = params[:resultId].to_i + 1 %> | <%= link_to "Next", request.fullpath.split("/" + params[:dbid])[0] + "/switch/?" + generate_next_url + "&resultId=" + nextId.to_s %> <% end %> @@ -14,7 +14,7 @@
    <% if params[:resultId].present? and session[:results].present? %> - <%= link_to "Back to Search Results", request.fullpath.split("/" + params[:dbid])[0] + "?" + generate_next_url %> + <%= link_to "Back to Search Results", request.fullpath.split("/" + params[:dbid])[0] + "?" + generate_next_url + "&fromDetail=y" %> | <% end %> New Search diff --git a/app/views/articles/_search_links.html.erb b/app/views/articles/_search_links.html.erb index b6cd929ed..2348064eb 100755 --- a/app/views/articles/_search_links.html.erb +++ b/app/views/articles/_search_links.html.erb @@ -1,7 +1,7 @@ diff --git a/app/views/articles/_search_results.html.erb b/app/views/articles/_search_results.html.erb index 129d1e2ab..4b86fc573 100755 --- a/app/views/articles/_search_results.html.erb +++ b/app/views/articles/_search_results.html.erb @@ -16,16 +16,15 @@ <% end %>
    <%= show_pubtype(result) %>
    - <% if has_any_fulltext?(result) %> - -
    <%= show_resultid(result) %>. <%= link_to show_title(result), show_detail_link(result, show_resultid(result), params[:q]) %>
    - + <% if has_restricted_access?(result) %> +
    <%= show_resultid(result) %>. This result cannot be shown to guests. <%= link_to "Please log in to see this result.", show_detail_link(result, show_resultid(result), params[:q]) %>
    <% else %>
    <%= show_resultid(result) %>. <%= link_to show_title(result), show_detail_link(result, show_resultid(result), params[:q]) %>
    <% end %> <%# bookmark functions for items/docs %> <%# render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
    +<% unless has_restricted_access?(result) %>
    <% if (show_view_option == 'brief' or show_view_option == 'detailed') and has_authors?(result) %> @@ -63,6 +62,10 @@ <%= link_to "PDF Full Text", show_pdf_title_link(result) %> <% elsif has_html?(result) %> <%= link_to "HTML Full Text", show_best_fulltext_link(result), :target => "_blank" %> + <% elsif has_smartlink?(result) %> + <%= link_to "Linked Full Text", show_smartlink_title_link(result) %> + <% elsif has_ebook?(result) %> + <%= link_to "eBook Full Text", show_ebook_title_link(result) %> <% else %> <%= show_best_fulltext_link_detail(result) %> <% end %> @@ -72,8 +75,13 @@
    <%= show_ill(result) %>
    <% end %> -
    - + +<% else %> +
    +
    Note:
    +
    This result cannot be displayed unless you are <%= link_to "logged in", new_user_session_path %>.
    +
    +<% end %>
    <% end %> diff --git a/app/views/articles/detail.html.erb b/app/views/articles/detail.html.erb index 432fb910b..769ed3564 100755 --- a/app/views/articles/detail.html.erb +++ b/app/views/articles/detail.html.erb @@ -1,17 +1,32 @@ + +<% session[:current_url] = request.original_url %> + <% eds_connect %> -<% recordArray = retrieve(params[:dbid].to_s,params[:an].to_s,termsToHighlight(params[:highlight])) %> +<% + recordArray = retrieve(params[:dbid].to_s,params[:an].to_s,termsToHighlight(params[:highlight])) + clean_params = deep_clean(params) + params = clean_params +%> +<% unless session[:results].present? %> + <% if session[:apiquery].present? %> + <% search(session[:apiquery]) %> + <% end %> +<% end %> <% if recordArray['Record'].present? %> <% record = recordArray['Record'] %> <% end %> +<% if has_restricted_access?(record) %> + +<% else %> +
    <%= render 'previous_next_doc' %> - - <% @page_title = show_title(record) << " - Detailed Record - Blacklight" %> + <% @page_title = Sanitize.clean(show_title(record)) << " - Detailed Record - Blacklight" %> <%# this should be in a partial -%>
    @@ -55,7 +70,11 @@ <% if has_full_text_on_screen?(record) %>
    Full Text:
    -
    <%= show_full_text_on_screen(record).html_safe %>
    + <% if authenticated_user? %> +
    <%= show_full_text_on_screen(record).html_safe %>
    + <% else %> +
    <%= link_to "Please log in to display full-text.", new_user_session_path %>
    + <% end %> <% end %> @@ -77,10 +96,10 @@
    <%= show_pubtype(record) %>
    - + <% if authenticated_user? %> <% if has_any_fulltext?(record) %> - <% fulltextlinks = [] %>
    Full-Text Options:
    + <% fulltextlinks = [] %>
    <% if has_pdf?(record) %> <% fulltextlinks.push(link_to("PDF Full Text", show_pdf_link(record))) %> @@ -88,6 +107,13 @@ <% if has_html?(record) %> <% fulltextlinks.push(link_to("HTML Full Text", "#fulltext")) %> <% end %> + <% if has_smartlink?(record) %> + <% fulltextlinks.push(link_to("Linked Full Text", show_smartlink(record))) %> + <% end %> + <% if has_ebook?(record) %> + <% fulltextlinks.push(link_to("eBook Full Text", show_ebook_link(record))) %> + <% end %> + <% if has_fulltext?(record) %> <% fulltextlinks.push(show_best_fulltext_link_detail(record)) %> <% end %> @@ -97,11 +123,15 @@
    Interlibrary Loan:
    <%= show_ill(record) %>
    <% end %> + <% else %> +
    <%= link_to "Please log in to see full-text options", new_user_session_path %>
    + <% end %> +
    Other Options:
    <%= link_to("View Record in EDS",show_plink(record),:target => "_blank") %>
    - +<% end %> <%# render :partial => 'debug' %> diff --git a/app/views/articles/fulltext.html.erb b/app/views/articles/fulltext.html.erb index 36b6868d8..cf8ebf1c1 100755 --- a/app/views/articles/fulltext.html.erb +++ b/app/views/articles/fulltext.html.erb @@ -1,16 +1,35 @@ +<% session[:current_url] = request.original_url %> + +<% if authenticated_user? %> + <% eds_connect %> +<% + clean_params = deep_clean(params) + params = clean_params +%> <% recordArray = retrieve(params[:dbid].to_s,params[:an].to_s) %> <% if recordArray['Record'].present? %> <% record = recordArray['Record'] %> <% end %> + <% if has_pdf?(record) %> <%= link_to "Loading PDF Full Text", show_pdf_link(record) %> <% elsif has_html?(record) %> " /> <%= link_to "Loading HTML Full Text", request.fullpath.split("/fulltext")[0] %> +<% elsif has_smartlink?(record) %> + +<%= link_to "Loading Linked Full Text", show_smartlink(record) %> +<% elsif has_ebook?(record) %> + +<%= link_to "Loading eBook", show_ebook_link(record) %> <% else %> <%= link_to "Loading Full Text", show_best_fulltext_link_detail(record) %> <% end %> + +<% else %> + +<% end %> diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb index 7ca260001..0f0e16ca8 100755 --- a/app/views/articles/index.html.erb +++ b/app/views/articles/index.html.erb @@ -1,29 +1,32 @@ - -<% eds_connect %> +<% +## +# Copyright 2013 EBSCO Information Services +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +%> -<% if params[:dbid].present? and params[:an].present? %> -

    Opening PDF Full-Text....

    -

    You may close this window to return to your search results.

    - <% retrieve(params[:dbid].to_s, params[:an].to_s) %> - <% if has_pdf?(session[:record]['Record']) %> - - - - <% else %> - - <% end %> -<% else %> +<% session[:current_url] = request.original_url %> + +<% eds_connect %> <% if has_search_parameters? %> - <% options = generate_api_query(params) %> - <% search(options) %> + <% options = generate_api_query(params) %> + <% clean_params = deep_clean(params) %> + <% params = clean_params %> + + <% unless params[:fromDetail] == 'y' and session[:results] %> + <% search(options) %> + <% end %> <% end %>