From 99d293129cf454c1c7b99eca3b5c996fc0ef8f57 Mon Sep 17 00:00:00 2001 From: Brett Bieber <brett.bieber@gmail.com> Date: Thu, 16 Sep 2010 18:33:26 +0000 Subject: [PATCH] Simplify peoplefinder result handling. Use internal WDN.get to take advantage of browsers that support CORS, just display the raw HTML returned for right now. --- www/searchFunc.js | 65 ++++------------------------------------------- 1 file changed, 5 insertions(+), 60 deletions(-) diff --git a/www/searchFunc.js b/www/searchFunc.js index 1055bb0..b7f235b 100644 --- a/www/searchFunc.js +++ b/www/searchFunc.js @@ -149,71 +149,16 @@ UNL_Search.doPeoplefinderQuery = function (val) { if (cacheData) { this.handlePeoplefinderResults(cacheData); } else { - var http = new XMLHTTP(); - - http.open("GET", "http://peoplefinder.unl.edu/service.php?q=" + val, true); var pointer = this; - http.onreadystatechange = function(){ - if (http.readyState == 4) { - if (http.status == 200) { - var data = http.responseText; - pointer.peoplefinderCache.save(val, data); - pointer.handlePeoplefinderResults(data); - } else { - // Error loading file! - } - } - }; - - http.send(null); + WDN.get("http://peoplefinder.unl.edu/service.php?q=" + val, function(data){ + pointer.peoplefinderCache.save(val, data); + pointer.handlePeoplefinderResults(data); + }); } }; UNL_Search.handlePeoplefinderResults = function (peoplefinderText) { - var htmlDoc = _b.DOM.cE("div"); - htmlDoc.innerHTML = peoplefinderText; - - var results = htmlDoc.getElementsByTagName("ul"); - - if (results.length > 0) { - var goodResults = _b.DOM.cE("ul"); - - var resultSet = results[0].getElementsByTagName("li"); - var i; - var len = resultSet.length; - for (i = 0; i < 10 && i < len; i++) { - if (i % 2 != 0) { - resultSet[0].className = "ppl_Sresult alt"; - } else { - resultSet[0].className = "ppl_Sresult"; - } - theAs = resultSet[0].getElementsByTagName("a"); - for (var j = 0; j < theAs.length; j++) { - if (theAs[j].href.indexOf("peoplefinder") > -1) { - if (theAs[j].parentNode.nodeName != "LI") { - theAs[j].onclick = function(){ return UNL_Search.showHCard(this.parentNode.parentNode, this.href) }; - } else { - theAs[j].onclick = function(){ return UNL_Search.showHCard(this.parentNode, this.href) }; - } - } - - } - - goodResults.appendChild(resultSet[0]); - - } - document.getElementById("ppl_results").innerHTML = ''; - document.getElementById("ppl_results").appendChild(goodResults); - - if (i < len) { - var div = _b.DOM.cE("div"); - div.style.textAlign = "right"; - div.innerHTML = '<a href="http://peoplefinder.unl.edu/?q=' + this.query + '">More Results >></a></div>'; - document.getElementById("ppl_results").appendChild(div); - } - } else { - document.getElementById("ppl_results").innerHTML = 'No matches found. Would you like to <a href="http://peoplefinder.unl.edu/?adv=y" title="Click here to perform a detailed Peoplefinder search">try a Detailed Search?</a>' - } + WDN.jQuery('#ppl_results').html(peoplefinderText); }; UNL_Search.doQuery = function (form) { -- GitLab