From 22266c2d8e4fdb0ad5011107f61cefeb5a6a7f8b Mon Sep 17 00:00:00 2001
From: Paul Pound <ppound@upei.ca>
Date: Fri, 30 May 2014 10:58:58 -0300
Subject: [PATCH] using labels provided by eds

---
 targets/eds/css/roblib_search_eds.css |  4 +++
 targets/eds/js/eds_results.js         |  8 +++---
 targets/eds/js/eds_results_article.js | 36 +++++++++++++++------------
 targets/eds/roblib_search_eds.module  |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/targets/eds/css/roblib_search_eds.css b/targets/eds/css/roblib_search_eds.css
index f52b497..0df0197 100644
--- a/targets/eds/css/roblib_search_eds.css
+++ b/targets/eds/css/roblib_search_eds.css
@@ -11,3 +11,7 @@
 .eds-sor, .eds-date, .eds-holdings-item, .eds-db, .eds-src, .eds-pubinfo, .eds-type{
    padding-left: 10px; font-size: smaller;
 }
+
+.eds-label {
+    font-weight: bolder;
+}
diff --git a/targets/eds/js/eds_results.js b/targets/eds/js/eds_results.js
index 7d06d5c..f0f0d0a 100644
--- a/targets/eds/js/eds_results.js
+++ b/targets/eds/js/eds_results.js
@@ -25,9 +25,11 @@ Drupal.behaviors.roblib_search_eds = {
                                 items.push('<a href="'+val.PLink+'">'+val2.Data+'</a></div>');
                             }) 
                         }
+                        items.push('<div class="eds-sor">');
                         jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){
-                            items.push('<div class="eds-sor">'+authors.NameFull+'</div>');
-                        }) 
+                            items.push(authors.NameFull+';'+' ');
+                        })
+                        items.push('</div>');
                         if (typeof val.Items.Src !== 'undefined') {
                             jQuery.each(val.Items.Src, function(key4, source){                        
                                 items.push('<div class="eds-src">'+source.Data+'</div>');                        
@@ -40,7 +42,7 @@ Drupal.behaviors.roblib_search_eds = {
                         }
                         if (typeof val.Items.TypPub !== 'undefined') {
                             jQuery.each(val.Items.TypPub, function(key6, typpub){                        
-                                items.push('<div class="eds-type">'+typpub.Data+'</div>');                        
+                                items.push('<div class="eds-type"><span class="eds-label">'+typpub.Label+'</span>: '+typpub.Data+'</div>');
                             })   
                         }              
                     
diff --git a/targets/eds/js/eds_results_article.js b/targets/eds/js/eds_results_article.js
index 78d0255..e3ee0a2 100644
--- a/targets/eds/js/eds_results_article.js
+++ b/targets/eds/js/eds_results_article.js
@@ -25,26 +25,30 @@ Drupal.behaviors.roblib_search_eds_articles = {
                                 items.push('<a href="'+val.PLink+'">'+val2.Data+'</a></div>');
                             }) 
                         }
+                        items.push('<div class="eds-sor">');
                         jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){
-                            items.push('<div class="eds-sor">'+authors.NameFull+'</div>');
-                        }) 
+                            items.push(authors.NameFull+';'+' ');
+                        })
+                        items.push('</div>');
                         if (typeof val.Items.Src !== 'undefined') {
-                            jQuery.each(val.Items.Src, function(key4, source){                        
-                                items.push('<div class="eds-src">'+source.Data+'</div>');                        
+                            jQuery.each(val.Items.Src, function(key4, source){
+                                items.push('<div class="eds-src"><span class="eds-label">'+source.Label+':</span> '+source.Data+'</div>');
                             })   
                         }
-                        if (typeof val.Items.PubIrInfo !== 'undefined') {
-                            jQuery.each(val.Items.PubIrInfo, function(key5, pubinfo){                        
-                                items.push('<div class="eds-pubinfo">'+pubinfo.Data+'</div>');                        
-                            })   
+                        //if (typeof val.Items.PubIrInfo !== 'undefined') {
+                        //    jQuery.each(val.Items.PubIrInfo, function(key5, pubinfo){
+                        //        items.push('<div class="eds-pubinfo">'+pubinfo.Data+'</div>');
+                        //    })
+                        //}
+                        //if (typeof val.Items.TypPub !== 'undefined') {
+                        //    jQuery.each(val.Items.TypPub, function(key6, typpub){
+                        //        items.push('<div class="eds-type">'+typpub.Data+'</div>');
+                        //    })
+                        //}
+                        if (typeof val.PLink !== 'undefined'){
+                            items.push('<div class="eds-db eds-pdf-link"><a href="'+val.PLink+'">Full Text</a></div>');
                         }
-                        if (typeof val.Items.TypPub !== 'undefined') {
-                            jQuery.each(val.Items.TypPub, function(key6, typpub){                        
-                                items.push('<div class="eds-type">'+typpub.Data+'</div>');                        
-                            })   
-                        }              
-                    
-                        items.push('<div class="eds-db">'+val.DbLabel+'</div>');
+                        //items.push('<div class="eds-db">'+val.DbLabel+'</div>');
                    
                         items.push('</div>');
                     }
@@ -57,7 +61,7 @@ Drupal.behaviors.roblib_search_eds_articles = {
             }) 
             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=eds&mode=bool&lang=en&bquery=';
-            jQuery('#roblib-search-eds-more').empty().append('<a href="'+href_str+query_str+'" id="see_all_results">See all ' + data.recordCount + ' results</a>');
+            jQuery('#roblib-search-eds-article-more').empty().append('<a href="'+href_str+query_str+'" id="see_all_results">See all ' + data.recordCount + ' results</a>');
 
         });
     }  
diff --git a/targets/eds/roblib_search_eds.module b/targets/eds/roblib_search_eds.module
index f5f7191..2c7b37f 100644
--- a/targets/eds/roblib_search_eds.module
+++ b/targets/eds/roblib_search_eds.module
@@ -225,7 +225,7 @@ function roblib_search_eds_get_results($query = NULL, $type = NULL) {
   $number_per_page = variable_get('roblib_search_eds_num_results', '5');
   $query = urlencode($query);
   $query = $query;
-  $params = "query=AND,$query&includefacets=y&$limiters&resultsperpage=$number_per_page";
+  $params = "query=OR,$query&includefacets=y&$limiters&resultsperpage=$number_per_page";
   $output = $eds_api->apiSearch($params);
   return json_encode($output);
 }