reformatted code and started work on formatting eds article results

targets/eds/js/eds_results.js

@@ -28,18 +28,13 @@ Drupal.behaviors.roblib_search_eds = {
                 items.push('<a href="http://proxy.library.upei.ca/login?url=' + val.PLink + '&scope=site">' + val2.TitleFull + '</a></div>');
               })
             }
-           val.pubType == 'Book' ? pubType = 'Print Book' : pubType = val.pubType;
+            pubType = val.pubType;
 
             pubYear = val.RecordInfo.BibRelationships.IsPartOfRelationships["date"];
             !pubYear ? pubYear = " " : pubYear = pubYear[0]["Y"];
 
-            if (typeof val.Items.TypPub !== 'undefined') {
+            items.push('<div class="eds-type"><span class="eds-pubyear">' + pubYear + '</span> - ' + pubType + '</div>');
-              jQuery.each(val.Items.TypPub, function (key6, typpub) {
+
-                //strs = typpub.Data.split('; ');
-                //types = roblib_intersects(strs, ['<span class="highlight">Book</span>', '<span class="highlight">eBook</span>']);
-                items.push('<div class="eds-type"><span class="eds-pubyear">' + pubYear + '</span> - ' + pubType + '</div>');
-              })
-            }
             var roblib_authors =[];
             jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function (key3, author) {
               roblib_authors.push(author.NameFull);
@@ -50,7 +45,7 @@ Drupal.behaviors.roblib_search_eds = {
             items.push(roblib_authors);
             items.push('</div>');
 
-            if (typeof val.Items.Src !== 'undefined') {
+            /*if (typeof val.Items.Src !== 'undefined') {
               jQuery.each(val.Items.Src, function (key4, source) {
                 items.push('<div class="eds-src">' + source.Data + '</div>');
               })
@@ -59,7 +54,7 @@ Drupal.behaviors.roblib_search_eds = {
               jQuery.each(val.Items.PubIrInfo, function (key5, pubinfo) {
                 items.push('<div class="eds-pubinfo">' + pubinfo.Data + '</div>');
               })
-            }
+            }*/
             var url;
             !val.Items.URL ? url = " " : url = val.Items.URL[0].Data;
             if(url) {

targets/eds/js/eds_results_article.js

@@ -1,77 +1,79 @@
 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) {
-            var items = [];
+      var items = [];
-            var numberOfDocs = 0;
+      var numberOfDocs = 0;
-            try {
+      try {
-                numberOfDocs = data.records.length;
+        numberOfDocs = data.records.length;
-            } catch (err) {
+      } catch (err) {
-                // do nothing leave docLength at 0
+        // do nothing leave docLength at 0
+      }
+      if (numberOfDocs < 1) {
+        jQuery('#' + 'roblib-search-content-eds').empty().append('No Results');
+        jQuery('.' + 'pane-roblib-search-eds-roblib-search-eds-articles').hide();
+      } else {
+        var counter = 0;
+        var divs = new Array();
+        var content = new Array();
+        jQuery.each(data.records, function (key, val) {
+          id = 'roblib-search-eds-article-' + counter;
+          divs[counter++] = id;
+
+          if (typeof val.Items !== 'undefined') {
+            items.push('<div class ="roblib-search-row" id="' + id + '">');
+            if (typeof val.Items.Ti !== 'undefined') {
+              jQuery.each(val.Items.Ti, function (key2, val2) {
+                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>');
+              })
             }
-            if(numberOfDocs < 1){
+            pubType = val.pubType;
-                jQuery('#' + 'roblib-search-content-eds').empty().append('No Results');
-                jQuery('.' + 'pane-roblib-search-eds-roblib-search-eds-articles').hide();
-            } else {
-                var counter = 0;
-                var divs = new Array();
-                var content = new Array();
-                jQuery.each(data.records, function(key, val) {
-                    id = 'roblib-search-eds-article-' + counter;
-                    divs[counter++] = id;
 
-                    if (typeof val.Items !== 'undefined') {
+            pubYear = val.RecordInfo.BibRelationships.IsPartOfRelationships["date"];
-                         items.push('<div class ="roblib-search-row" id="' + id +'">');
+            !pubYear ? pubYear = " " : pubYear = pubYear[0]["Y"];
-                        if (typeof val.Items.Ti !== 'undefined') {
+
-                            jQuery.each(val.Items.Ti, function(key2, val2){
+            items.push('<div class="eds-type"><span class="eds-pubyear">' + pubYear + '</span> - ' + pubType + '</div>');
-                                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('<div class="eds-sor">');
-                        jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function(key3, authors){
-                            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"><span class="eds-label">'+source.Label+':</span> '+source.Data+'</div>');
-                            })
-                        }
-                        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>');
-                        }
-                        if (typeof val.PLink !== 'undefined' && typeof val.HTML !== 'undefined'  && val.HTML == '1'){
-                            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>');
-                    }
-                });
-                jQuery('#' + 'roblib-search-content-eds-articles').empty().append(items.join(''));
-                //qtipify(divs, content, 'Notes');
-            }
 
-            var queries = [];
+            var roblib_authors = [];
-            jQuery.each(data.queries, function(key7, query){
+            jQuery.each(val.RecordInfo.BibRelationships.HasContributorRelationships, function (key3, author) {
-                queries.push(query.query);
+              roblib_authors.push(author.NameFull);
             })
-            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=';
-            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 (' + data.recordCount + ')</a>');
 
+            items.push('<div class="eds-sor">');
+            roblib_authors = roblib_shorten(roblib_authors.join('; '), 50, " ");
+            items.push(roblib_authors);
+            items.push('</div>');
+
+
+            if (typeof val.Items.Src !== 'undefined') {
+              jQuery.each(val.Items.Src, function (key4, source) {
+                items.push('<div class="eds-src"><span class="eds-label">In:</span> ' + source.Data + '</div>');
+              })
+            }
+            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>');
+            }
+            if (typeof val.PLink !== 'undefined' && typeof val.HTML !== 'undefined' && val.HTML == '1') {
+              items.push('<div class="eds-db eds-pdf-link"><a href="' + val.PLink + '&scope=site">HTML Full Text</a></div>');
+            }
+            items.push('</div>');
+          }
         });
-    }
+        jQuery('#' + 'roblib-search-content-eds-articles').empty().append(items.join(''));
+      }
+
+      var queries = [];
+      jQuery.each(data.queries, function (key7, query) {
+        queries.push(query.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=';
+      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 (' + data.recordCount + ')</a>');
+
+    });
+  }
 }
 
-/*function edsArticlesPopulatePopupDivs(content, val, counter){
-    content[counter] = '';
-    jQuery.each(val.DetailedRecord, function(key, value){
-        if(value.Group == 'Note') {
-         content[counter] += '<div class="eds-popup-content"><span class="eds-popup-label">' + value.Label  + '</span>' ;
-         content[counter] += '<span class="eds-popup-value"> ' + value.Data +'</span></div>';
-        }
-    })
-}     */