From 1af5989ac15152169862bab705e870603399f264 Mon Sep 17 00:00:00 2001 From: walljm Date: Thu, 27 Dec 2012 18:41:04 -0500 Subject: [PATCH] minor fixes, removed sortable verse list, as it wasn't useful yet. finished json full text conversion. --- DynamicBibleUtility/DynamicBibleUtility.suo | Bin 30208 -> 30720 bytes .../DynamicBibleUtility/Text.cs | 1 + .../DynamicBibleUtility/frmMain.cs | 168 ++++++------------ js/common.js | 4 +- 4 files changed, 55 insertions(+), 118 deletions(-) diff --git a/DynamicBibleUtility/DynamicBibleUtility.suo b/DynamicBibleUtility/DynamicBibleUtility.suo index e089bfc964c4c791bc63efaa0192e38f46d80e88..23f0459f4c2e46955bd427191ba8975dc372e4b7 100644 GIT binary patch delta 1320 zcmZp8!`SeFal;8F7Apn@hRJ7`WHvvElVF_0;={;0S&>DacR_V?L-&)jjLZxS3=Wek zSx!wp%wjl6h-GpGs}F||0|SE~NZ+|4jmZZDSvLP*4Pa!M0TS_HU%)btfq`N32likl zPDTX=1_pkRI7np)R{)1N0|SFROyCPw0EZ$21A`JwpoH6>lTn0$fq@ey(jd*U`3JW* z6Uh3>C42!K91IK$+A!HKeEtv#{ty-(sNm)={C-Sq0&ENnObn9)gf~o<*YjrlHaSpu z{bYGP-bo@Z98wGn43bdQlS@PbIHVaE7`UMVY#i|b>?K`Vqjq4 zgDQ~GU|?W~V`2b<%%q&u(vr-a%#zBOlGKWl$qHiHlbwb4f-Lo5W^g*p=wfAHWnfip zU~J^<*#1;scT|p>zW%o8#%g~8(F#;7}eJJrWPfa7FEVTX}$2&B*%h+ z$@7HlBy&^2GPzI{<*7+}$@zI{ndy_;#N{?gG%z#rPHvPw%)!dQzyON0$>0!|3E=qu z|Nnn6sM{xhk@27GtZlowLG}kD(*n-PRq}o;DsV}8e@;eK22j8;Fo5)LE>Q?zW($n@e98;+(qNGyu33^uw9496K67`*iv7{nME7(jYJxRHT@p^1Tkp_ze! zp@o5g;ooGzICszKAlCo?|7S8VFwA0LV3^Ioz%Yk_fnhFGd_DsM!vY2dhJ_3a42u{T z7#1@yFf4(}En{F{SkAz}u!4bsVddn9OwyD0#A$4P5huYoF@a_B0VRjY4z@EUpR;B& zLiKj_8b4E>ycpZ4wJC>IJWOB)r3{b@k@04M#2u_G63}?q{3VTrk==n2oU|tkdhegS zFGGwskdc7_l(|4O@8pLWjf?@4lQUx{JCw*wUMs9Jxi(u?Ob()lfq_BufGQ&cgD(RE zg9|LvNwUDRMsAi8FDP$=Y-C_aNv)WyAf`TfyRysVXQsC%^W`^9UMQx(_+;`yC3~>1 z_7(G~7;3lnMy4(2e43%maqh>~rECm{(1!VCvVhvU$#q2rlcQoXHc!YeV4K{asKjVA zS&>C{@&RoVwgv_U1_8#&Rf-yuA4$ticHrY+0T}~I7#O%FFHDu6oWP+o`B;(F NHvAE3(M*K45zK<>cnGjLZxS z3=NYjSx#{>sxvS!a4;}1Og>knF-eGJas{goivWm!sz_(@0YR3{KUf18Ax8SJF90(( ze_#)0;$%=_U|`?^sXSMtF}Z{*V6uy>!Q?Mo0US&W3=AxA32uK@1_coBRFTf+FWml2 zoQ&)Y3=E1OA+S!q0FM9v|Nqy934G!6=VSzl@WVt(_(NEvpq$NL`2CpJCa^FtFfvR& zqiHg^M(FrtYq7nPL|izy85kHOq3R}=h(OHcfeNsJWTvr9{w3nc$tcahz`zTYm|P<2 zKlw0=A&&+F14A6h@gRvBJ(tNg;#_t|7+tIktPHHGoeeDdo>lzxm80b2>8anD47&sa@TN=2zxj7rx z*4X%F7AL!9=A;(e)lA-?A>meBl9^s?l$2bckOmTsNlMB~)GaE_NiEi^$jzy#sdjTT zc6Ko~bk()AFn7{5F)?=3wREyD)HSp)Gc+)9wQzBCHmsd|TGMoLjgagni3Vmy?#YeP zhdG297#M^=Ap(vpnE(z@;t_)he39{=>?~@#xk2^^Bhw-F$yM@xlR+uxi##|?HnU;?n3|ZGo7BEy+&z5@)cosKWi7#=^*MzzFv5 zWI^x!llNta@rp4rfO8~>wx0YjqmfZ`a&l%YQ)SHL#4O>-^Mt%6_v&#>{wpNHo{^eU zkXlp>N}`jsvXv(5vv4rEyqbJg(|B@?P!3EPYi3?bY6VOY7bvxW;=<)4nnE|p8n^tS qT(E0U2$whLDkp1YiwWL=D-t*$0&?`^Kn}Cb6S5~TZk~`|zy<)Go|1(C diff --git a/DynamicBibleUtility/DynamicBibleUtility/Text.cs b/DynamicBibleUtility/DynamicBibleUtility/Text.cs index 8c9053d6..71580dcb 100644 --- a/DynamicBibleUtility/DynamicBibleUtility/Text.cs +++ b/DynamicBibleUtility/DynamicBibleUtility/Text.cs @@ -24,5 +24,6 @@ namespace DynamicBibleUtility { public string txt = ""; public string str = ""; + public int i = -1; } } diff --git a/DynamicBibleUtility/DynamicBibleUtility/frmMain.cs b/DynamicBibleUtility/DynamicBibleUtility/frmMain.cs index cea77dfa..125ed6b1 100644 --- a/DynamicBibleUtility/DynamicBibleUtility/frmMain.cs +++ b/DynamicBibleUtility/DynamicBibleUtility/frmMain.cs @@ -274,129 +274,67 @@ namespace DynamicBibleUtility { Book bk = new Book(); bk.bk = el.FirstAttribute.Value.ToString(); - foreach (XElement chn in el.Descendants()) + foreach (XElement chn in el.Nodes()) { Chapter ch = new Chapter(); ch.ch = chn.FirstAttribute.Value; + foreach (XElement vs in chn.Nodes()) + { + Verse v = new Verse(); + v.vs = vs.FirstAttribute.Value; + int i = 0; + foreach (object o in vs.Nodes()) + { + Text t = new Text(); + if (o.GetType() == typeof(XElement)) + { + t.txt = ((XElement)o).Value; + if (((XElement)o).Name == "gr") + { + if (Convert.ToInt32(bk.bk) >= 40) + { + t.str = "G" + ((XElement)o).FirstAttribute.Value; + } + else + { + t.str = "H" + ((XElement)o).FirstAttribute.Value; + } + } + else if ((((XElement)o).Name.ToString().ToLower() == "style")) + { + // do nothing, because we don't care about style right now. + } + else + { + throw new Exception("Unknown Element"); + } + t.i = i++; + } + else if (o.GetType() == typeof(XText)) + { + t.txt = ((XText)o).Value; + t.i = i++; + } + else + { + throw new Exception("Unknown Element"); + } + v.words.Add(t); + } + ch.vss.Add(v); + } + bk.chs.Add(ch); + System.IO.File.WriteAllText(bk.bk.ToString() + "-"+ch.ch+".json", Serialize(ch)); } + bbl.Add(bk); + + UpdateStatus("Book: " + bk.bk + "\r\n"); } } } - - // to index, you need to iterate through every word in the bible. - /* - foreach (DynamicBible.Schemas.XMLBIBLE_BOOK bk in b.BIBLEBOOKS) - { - Book book = new Book(); - book.bk = bk.bnumber.ToString(); - foreach (DynamicBible.Schemas.XMLBIBLE_CHAPTER ch in bk.CHAPTERS) - { - Chapter chapter = new Chapter(); - chapter.ch = ch.cnumber.ToString(); - foreach (DynamicBible.Schemas.XMLBIBLE_VERSES vs in ch.VERSES) - { - Verse verse = new Verse(); - verse.vs = vs.vnumber.ToString(); - if (vs.Items != null) - { - foreach (object w in vs.Items) - { - // for each word, add an entry. - if (w.GetType() == typeof(DynamicBible.Schemas.XMLBIBLE_GR)) - { - DynamicBible.Schemas.XMLBIBLE_GR gr = ((DynamicBible.Schemas.XMLBIBLE_GR)w); - if (gr.Text != null) - { - foreach (string t in gr.Text) - { - foreach (string s in t.Split(' ')) - { - AddWordToIndex(s, bk.bnumber.ToString(), ch.cnumber.ToString(), vs.vnumber.ToString()); - } - } - } - } - else if (w.GetType() == typeof(DynamicBible.Schemas.XMLBIBLE_STYLE_ITEM)) - { - DynamicBible.Schemas.XMLBIBLE_STYLE_ITEM o = ((DynamicBible.Schemas.XMLBIBLE_STYLE_ITEM)w); - if (o.Text != null) - { - foreach (string t in o.Text) - { - foreach (string s in t.Split(' ')) - { - AddWordToIndex(s, bk.bnumber.ToString(), ch.cnumber.ToString(), vs.vnumber.ToString()); - } - } - } - if (o.gr != null) - { - DynamicBible.Schemas.XMLBIBLE_STYLE_GR gr = o.gr; - if (gr.Text != null) - { - foreach (string t in gr.Text) - { - foreach (string s in t.Split(' ')) - { - AddWordToIndex(s, bk.bnumber.ToString(), ch.cnumber.ToString(), vs.vnumber.ToString()); - } - } - } - } - if (o.STYLE != null) - { - foreach (DynamicBible.Schemas.XMLBIBLE_STYLE_STYLE so in o.STYLE) - { - if (so.Text != null) - { - foreach (string t in so.Text) - { - foreach (string s in t.Split(' ')) - { - AddWordToIndex(s, bk.bnumber.ToString(), ch.cnumber.ToString(), vs.vnumber.ToString()); - } - } - } - if (so.gr != null) - { - DynamicBible.Schemas.XMLBIBLE_STYLE_STYLE_GR gr = so.gr; - if (gr.Value != null) - { - foreach (string s in gr.Value.Split(' ')) - { - AddWordToIndex(s, bk.bnumber.ToString(), ch.cnumber.ToString(), vs.vnumber.ToString()); - } - } - } - } - } - } - } - } - if (vs.Text != null) - { - foreach (string w in vs.Text) - { - foreach (string s in w.Split(' ')) - { - if (s != null && s.Trim() != "") - { - verse.words.Add(s); - } - } - } - } - chapter.vss.Add(verse); - } - - book.chs.Add(chapter); - } - bbl.Add(book); - UpdateStatus("Book: " + bk.bnumber + ", Word Count: " + _words.Count + "\r\n"); - } - - */ + // finished. + } } } diff --git a/js/common.js b/js/common.js index 66935f59..b8c07aa9 100644 --- a/js/common.js +++ b/js/common.js @@ -127,9 +127,7 @@ function Search(sv) } } - $( "#result" ).sortable(); - $( "#result" ).disableSelection(); - + $( "#result" ).sortable({ axis: "x", handle: ".handle" }); } catch (err) {