diff --git a/css/bible.css b/css/bible.css index 180c56ed..6c018ba3 100644 --- a/css/bible.css +++ b/css/bible.css @@ -160,6 +160,7 @@ h3 { .result .resultbody { display: block; + padding-left: 55px; } #main .block { diff --git a/js/common.js b/js/common.js index bde628c1..1a909d3d 100644 --- a/js/common.js +++ b/js/common.js @@ -116,10 +116,6 @@ function Search(sv) return false; } -var RMAC = { - -} - var Bible = { DisplayPassage: function(vs, b, ch, sv, ev, testament) { @@ -246,6 +242,41 @@ var Strongs = { } }); + url = "xml/rs" + parseInt((sn - 1) / 1000) + ".xml"; + // rmac is a two get process. + $.ajax({ + async: false, + type: "GET", + url: url, + dataType: "xml", + success: function(d, t, x) + { + results.rmac = d; + }, + error: function(request, status, error) + { + Utility.handleError(error, request); + } + }); + + // deal with RMAC + results.rmaccode = $(results.rmac).find('strongs[id="' + sn + '"]').attr("rmac"); + url = "xml/r-" + results.rmaccode.substring(0, 1) + ".xml"; + $.ajax({ + async: false, + type: "GET", + url: url, + dataType: "xml", + success: function(d, t, x) + { + results.rmac = d; + }, + error: function(request, status, error) + { + Utility.handleError(error, request); + } + }); + return results; }, @@ -256,7 +287,7 @@ var Strongs = { var title = $(entry).find("title").text(); var trans = $(entry).find("transliteration").text(); var pron = $(entry).find("pronunciation").text(); - var desc = $(entry).find("description").text(); + var desc = Traverse($(entry).find("description")[0]); var re = /([hg][0-9]{1,4})/gi; @@ -282,10 +313,17 @@ var Strongs = { }); crtxt += ""; + // ...processing statements go here... + var rtxt = "Robinsons Morphological Analysis Code: " + r.rmaccode + "
"; ; + $(r.rmac).find('item[id="' + r.rmaccode.toUpperCase() + '"]').find("description").each(function() + { + rtxt += $(this).text() + "
"; + }); + // put together the display. // ok. we have to do this because click events seem to be cumulative with jquery. - var t = $("
" + trans + " (" + r.sn + ") - " + pron + " - " + title + " - " + desc + "" + crtxt + "
"); + var t = $("
" + trans + " (" + r.sn + ") - " + pron + " - " + title + " - " + desc + "
" + rtxt + crtxt + "

"); t.find(".link").click(function(e) { diff --git a/js/rmac.js b/js/rmac.js deleted file mode 100644 index 043ddfff..00000000 --- a/js/rmac.js +++ /dev/null @@ -1,55 +0,0 @@ -// -// This code was written by Jason Wall. Feel free to use, and if you can, include a link back to www.walljm.com -// Jason@walljm.com // www.walljm.com -// - -function getRmac(sn) { - url = "xml/rs" + parseInt((sn-1)/1000) + ".xml"; - loadXMLDoc(url, processRSindex, sn); - -} - - -function processRSindex(xmlObj, strongsNum) { - // ...processing statements go here... - var oDict = xmlObj.documentElement; - var entries = oDict.getElementsByTagName("strongs"); - - for (i=0; i"; - rmacA[1]=rmac; - loadXMLDoc(url, processRmac, rmacA); - return true; - } - } -} - - -function processRmac(xmlObj, rmacA) { - // ...processing statements go here... - var oDict = xmlObj.documentElement; - var entries = oDict.getElementsByTagName("item"); - rmac = rmacA[1].toUpperCase(); - var r = document.getElementById('resultRmac'); - - r.innerHTML += rmacA[0]; - - for (i=0; i"; - for (j=0; j"; - } - break; - } - } - r.innerHTML += "
"; - -}