Browse Source

removed calls to qtipify and unlimited the local solr search

2.x-ebsco
vagrant 8 years ago
parent
commit
0d1b1fdacb
  1. 34
      targets/eds/js/eds_results.js
  2. 16
      targets/eds/js/eds_results_article.js
  3. 2
      targets/solr_site/js/solr_site_bestbet.js
  4. 2
      targets/solr_site/js/solr_site_databases.js
  5. 2
      targets/solr_site/js/solr_site_guides.js
  6. 2
      targets/solr_site/js/solr_site_reserves.js
  7. 2
      targets/solr_site/js/solr_site_results.js
  8. 2
      targets/solr_site/roblib_search_solr_site.module

34
targets/eds/js/eds_results.js

@ -1,5 +1,5 @@
Drupal.behaviors.roblib_search_eds = { Drupal.behaviors.roblib_search_eds = {
attach: function(context, settings) { attach: function(context, settings) {
$url = settings.roblib_search_eds.search_url; $url = settings.roblib_search_eds.search_url;
profile = 'eds'; //settings.roblib_search_eds.eds_profile; profile = 'eds'; //settings.roblib_search_eds.eds_profile;
jQuery.getJSON($url, function(data) { jQuery.getJSON($url, function(data) {
@ -27,7 +27,7 @@ Drupal.behaviors.roblib_search_eds = {
jQuery.each(val.Items.Ti, function(key2, val2){ jQuery.each(val.Items.Ti, function(key2, val2){
items.push('<div class="roblib-title eds">'); items.push('<div class="roblib-title eds">');
items.push('<a href="http://proxy.library.upei.ca/login?url='+val.PLink+'&scope=site">'+val2.Data+'</a></div>'); items.push('<a href="http://proxy.library.upei.ca/login?url='+val.PLink+'&scope=site">'+val2.Data+'</a></div>');
}) })
} }
items.push('<div class="eds-sor">'); items.push('<div class="eds-sor">');
jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){ jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){
@ -35,34 +35,34 @@ Drupal.behaviors.roblib_search_eds = {
}) })
items.push('</div>'); items.push('</div>');
if (typeof val.Items.Src !== 'undefined') { if (typeof val.Items.Src !== 'undefined') {
jQuery.each(val.Items.Src, function(key4, source){ jQuery.each(val.Items.Src, function(key4, source){
items.push('<div class="eds-src">'+source.Data+'</div>'); items.push('<div class="eds-src">'+source.Data+'</div>');
}) })
} }
if (typeof val.Items.PubIrInfo !== 'undefined') { if (typeof val.Items.PubIrInfo !== 'undefined') {
jQuery.each(val.Items.PubIrInfo, function(key5, pubinfo){ jQuery.each(val.Items.PubIrInfo, function(key5, pubinfo){
items.push('<div class="eds-pubinfo">'+pubinfo.Data+'</div>'); items.push('<div class="eds-pubinfo">'+pubinfo.Data+'</div>');
}) })
} }
if (typeof val.Items.TypPub !== 'undefined') { if (typeof val.Items.TypPub !== 'undefined') {
jQuery.each(val.Items.TypPub, function(key6, typpub){ jQuery.each(val.Items.TypPub, function(key6, typpub){
items.push('<div class="eds-type"><span class="eds-label">'+typpub.Label+'</span>: '+typpub.Data+'</div>'); items.push('<div class="eds-type"><span class="eds-label">'+typpub.Label+'</span>: '+typpub.Data+'</div>');
}) })
} }
items.push('<div class="eds-db">'+val.DbLabel+'</div>'); items.push('<div class="eds-db">'+val.DbLabel+'</div>');
items.push('</div>'); items.push('</div>');
} }
}); });
jQuery('#' + 'roblib-search-content-eds').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-eds').empty().append(items.join(''));
qtipify(divs, content, 'Notes'); //qtipify(divs, content, 'Notes');
} }
var queries = []; var queries = [];
jQuery.each(data.queries, function(key7, query){ jQuery.each(data.queries, function(key7, query){
queries.push(query.query); queries.push(query.query);
}) })
var query_str = data.queries[0].query; var query_str = data.queries[0].query;
//var host = "http://eds-api.ebscohost.com"; //var host = "http://eds-api.ebscohost.com";
//var get = "/edsapi/rest/Search?query=history&searchmode=all&resultsperpage=20&pagenumber=1&sort=relevance&highlight=y&includefacets=y&facetfilter=1%2cSourceType%3aMagazines%2cSourceType%3aNews%2cSourceType%3aAcademic+Journals%2cSourceType%3aConference+Materials&view=detailed"; //var get = "/edsapi/rest/Search?query=history&searchmode=all&resultsperpage=20&pagenumber=1&sort=relevance&highlight=y&includefacets=y&facetfilter=1%2cSourceType%3aMagazines%2cSourceType%3aNews%2cSourceType%3aAcademic+Journals%2cSourceType%3aConference+Materials&view=detailed";
@ -70,7 +70,7 @@ Drupal.behaviors.roblib_search_eds = {
jQuery('#roblib-search-eds-more').empty().append('<a href="http://proxy.library.upei.ca/login?url='+href_str+query_str+'" id="see_all_results">See all results</a>'); jQuery('#roblib-search-eds-more').empty().append('<a href="http://proxy.library.upei.ca/login?url='+href_str+query_str+'" id="see_all_results">See all results</a>');
}); });
} }
} }
function edsPopulatePopupDivs(content, val, counter){ function edsPopulatePopupDivs(content, val, counter){

16
targets/eds/js/eds_results_article.js

@ -1,5 +1,5 @@
Drupal.behaviors.roblib_search_eds_articles = { Drupal.behaviors.roblib_search_eds_articles = {
attach: function(context, settings) { attach: function(context, settings) {
$url = settings.roblib_search_eds_articles.search_url; $url = settings.roblib_search_eds_articles.search_url;
profile = 'eds'; //settings.roblib_search_eds.eds_profile; profile = 'eds'; //settings.roblib_search_eds.eds_profile;
jQuery.getJSON($url, function(data) { jQuery.getJSON($url, function(data) {
@ -28,7 +28,7 @@ Drupal.behaviors.roblib_search_eds_articles = {
jQuery.each(val.Items.Ti, function(key2, val2){ jQuery.each(val.Items.Ti, function(key2, val2){
items.push('<div class="roblib-title eds">'); items.push('<div class="roblib-title eds">');
items.push('<a href="http://proxy.library.upei.ca/login?url='+val.PLink+'&scope=site">'+val2.Data+'</a></div>'); items.push('<a href="http://proxy.library.upei.ca/login?url='+val.PLink+'&scope=site">'+val2.Data+'</a></div>');
}) })
} }
items.push('<div class="eds-sor">'); items.push('<div class="eds-sor">');
jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){ jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){
@ -38,7 +38,7 @@ Drupal.behaviors.roblib_search_eds_articles = {
if (typeof val.Items.Src !== 'undefined') { if (typeof val.Items.Src !== 'undefined') {
jQuery.each(val.Items.Src, function(key4, source){ jQuery.each(val.Items.Src, function(key4, source){
items.push('<div class="eds-src"><span class="eds-label">'+source.Label+':</span> '+source.Data+'</div>'); items.push('<div class="eds-src"><span class="eds-label">'+source.Label+':</span> '+source.Data+'</div>');
}) })
} }
if (typeof val.PLink !== 'undefined' && typeof val.PDF !== 'undefined' && val.PDF == 'pdflink'){ if (typeof val.PLink !== 'undefined' && typeof val.PDF !== 'undefined' && val.PDF == 'pdflink'){
items.push('<div class="eds-db eds-pdf-link"><a href="'+val.PLink+'&scope=site">PDF Full Text</a></div>'); items.push('<div class="eds-db eds-pdf-link"><a href="'+val.PLink+'&scope=site">PDF Full Text</a></div>');
@ -47,24 +47,24 @@ Drupal.behaviors.roblib_search_eds_articles = {
items.push('<div class="eds-db eds-pdf-link"><a href="'+val.PLink+'&scope=site">HTML Full Text</a></div>'); items.push('<div class="eds-db eds-pdf-link"><a href="'+val.PLink+'&scope=site">HTML Full Text</a></div>');
} }
//items.push('<div class="eds-db">'+val.DbLabel+'</div>'); //items.push('<div class="eds-db">'+val.DbLabel+'</div>');
items.push('</div>'); items.push('</div>');
} }
}); });
jQuery('#' + 'roblib-search-content-eds-articles').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-eds-articles').empty().append(items.join(''));
qtipify(divs, content, 'Notes'); //qtipify(divs, content, 'Notes');
} }
var queries = []; var queries = [];
jQuery.each(data.queries, function(key7, query){ jQuery.each(data.queries, function(key7, query){
queries.push(query.query); queries.push(query.query);
}) })
var query_str = data.queries[0].query; var query_str = data.queries[0].query;
var href_str = 'http://search.ebscohost.com/login.aspx?direct=true&site=ehost-live&scope=site&type=1&custid=uprince&groupid=main&profid=' + profile +'&mode=bool&lang=en&bquery='; var href_str = 'http://search.ebscohost.com/login.aspx?direct=true&site=ehost-live&scope=site&type=1&custid=uprince&groupid=main&profid=' + profile +'&mode=bool&lang=en&bquery=';
jQuery('#roblib-search-eds-article-more').empty().append('<a href="http://proxy.library.upei.ca/login?url='+href_str+query_str+'" id="eds-article-see-all-results">See all results</a>'); jQuery('#roblib-search-eds-article-more').empty().append('<a href="http://proxy.library.upei.ca/login?url='+href_str+query_str+'" id="eds-article-see-all-results">See all results</a>');
}); });
} }
} }
/*function edsArticlesPopulatePopupDivs(content, val, counter){ /*function edsArticlesPopulatePopupDivs(content, val, counter){

2
targets/solr_site/js/solr_site_bestbet.js

@ -28,7 +28,7 @@ Drupal.behaviors.roblib_search_solr_site_bestbet = {
}); });
jQuery('#' + 'roblib-search-content-solr-site-bestbet').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-solr-site-bestbet').empty().append(items.join(''));
qtipify(divs, content, 'Best Bet'); //qtipify(divs, content, 'Best Bet');
} }
}); });
} }

2
targets/solr_site/js/solr_site_databases.js

@ -31,7 +31,7 @@ Drupal.behaviors.roblib_search_solr_site_databases = {
}); });
jQuery('#' + 'roblib-search-content-solr-site-databases').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-solr-site-databases').empty().append(items.join(''));
qtipify(divs, content, 'Description'); //qtipify(divs, content, 'Description');
} }
if (numberOfDocs > 0) if (numberOfDocs > 0)

2
targets/solr_site/js/solr_site_guides.js

@ -30,7 +30,7 @@ Drupal.behaviors.roblib_search_solr_site_guides = {
<a href="' + val.url + '">' + val.label + '</a></div></div>'); <a href="' + val.url + '">' + val.label + '</a></div></div>');
}); });
jQuery('#' + 'roblib-search-content-solr-site-guides').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-solr-site-guides').empty().append(items.join(''));
qtipify(divs, content, 'Description'); //qtipify(divs, content, 'Description');
} }
if (numberOfDocs > 0) if (numberOfDocs > 0)
{ {

2
targets/solr_site/js/solr_site_reserves.js

@ -30,7 +30,7 @@ Drupal.behaviors.roblib_search_solr_site_reserves = {
<a href="' + val.url + '">' + val.label + '</a></div></div>'); <a href="' + val.url + '">' + val.label + '</a></div></div>');
}); });
jQuery('#' + 'roblib-search-content-solr-site-reserves').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-solr-site-reserves').empty().append(items.join(''));
qtipify(divs, content, 'Description'); //qtipify(divs, content, 'Description');
} }
if (numberOfDocs > 0) if (numberOfDocs > 0)
{ {

2
targets/solr_site/js/solr_site_results.js

@ -31,7 +31,7 @@ Drupal.behaviors.roblib_search_solr_site_results = {
}); });
jQuery('#' + 'roblib-search-content-solr-site-results').empty().append(items.join('')); jQuery('#' + 'roblib-search-content-solr-site-results').empty().append(items.join(''));
qtipify(divs, content, 'Summary'); //qtipify(divs, content, 'Summary');
} }
if (numberOfDocs > 0) if (numberOfDocs > 0)

2
targets/solr_site/roblib_search_solr_site.module

@ -253,7 +253,7 @@ function roblib_search_solr_site_block_view($delta = '') {
* The solr search string. * The solr search string.
*/ */
function roblib_search_solr_site_results($query) { function roblib_search_solr_site_results($query) {
print roblib_search_solr_site_get_results($query, '-bundle:course_reserve OR -bundle:bestbet OR -im_field_keywords:627 OR -bundle:database'); print roblib_search_solr_site_get_results($query, '');
exit(); exit();
} }

Loading…
Cancel
Save