diff --git a/app/controllers/Application.java b/app/controllers/Application.java index 044c4c9..402a722 100644 --- a/app/controllers/Application.java +++ b/app/controllers/Application.java @@ -14,6 +14,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; public class Application extends Controller { @@ -77,6 +78,8 @@ private static DisplayPlace getDisplayPlace(Place standardizedPlace) { } public static PlacesComparisonDTO comparePlacesFile(File scrapeFile) throws IOException { + Pattern compiledPattern = Pattern.compile("[, ]"); + PlacesComparisonDTO placesComparisonDTO = new PlacesComparisonDTO(); placesComparisonDTO.displayPlaces = new ArrayList(); @@ -100,23 +103,36 @@ public static PlacesComparisonDTO comparePlacesFile(File scrapeFile) throws IOEx String standard_text = split[1]; int numDataRecords = Integer.parseInt(split[2]); - int indx=0; List placesSubList = getDisplayPlacesList(place); - for (DisplayPlace displayPlace : placesSubList) { - if (indx == 0) - displayPlace.setInputPlace(place); - - indx++; + if (placesSubList.size() > 0) { + DisplayPlace displayPlace = placesSubList.get(0); + displayPlace.setInputPlace(place); displayPlace.setStandard_text(standard_text); displayPlace.setNumDataRecords(numDataRecords); - if (standard_text.equalsIgnoreCase(displayPlace.getFullName())) { + String fullName = displayPlace.getFullName(); + if (standard_text.equalsIgnoreCase(fullName)) { placesComparisonDTO.numExactMatches++; - continue; + displayPlace.setWasExactMatch("Yes!"); + } else { + displayPlace.setWasExactMatch("no"); + } + + + String modifedFolgName = compiledPattern.matcher(fullName).replaceAll(""); + String modifiedStandardText = compiledPattern.matcher(standard_text).replaceAll(""); + if (modifiedStandardText.equalsIgnoreCase(modifedFolgName)) { + placesComparisonDTO.numModifiedatches++; + displayPlace.setWasModifiedMatch("Yes!"); + } else { + displayPlace.setWasModifiedMatch("no"); } + + + placesComparisonDTO.displayPlaces.add(displayPlace); + } - placesComparisonDTO.displayPlaces.addAll(placesSubList); } placesComparisonDTO.numPlacesCompared = lineCount; diff --git a/app/models/DisplayPlace.java b/app/models/DisplayPlace.java index 5e05e08..dbaaec5 100644 --- a/app/models/DisplayPlace.java +++ b/app/models/DisplayPlace.java @@ -19,6 +19,8 @@ public class DisplayPlace { private String inputPlace; private String standard_text; private int numDataRecords; + private String wasExactMatch; + private String wasModifiedMatch; public String getFullName() { @@ -92,4 +94,20 @@ public int getNumDataRecords() { public void setNumDataRecords(int numDataRecords) { this.numDataRecords = numDataRecords; } + + public String getWasExactMatch() { + return wasExactMatch; + } + + public void setWasExactMatch(String wasExactMatch) { + this.wasExactMatch = wasExactMatch; + } + + public String getWasModifiedMatch() { + return wasModifiedMatch; + } + + public void setWasModifiedMatch(String wasModifiedMatch) { + this.wasModifiedMatch = wasModifiedMatch; + } } diff --git a/app/models/PlacesComparisonDTO.java b/app/models/PlacesComparisonDTO.java index 1b278f7..e352da7 100644 --- a/app/models/PlacesComparisonDTO.java +++ b/app/models/PlacesComparisonDTO.java @@ -11,6 +11,7 @@ public class PlacesComparisonDTO { public List displayPlaces; public int numExactMatches; + public int numModifiedatches; public int numPlacesCompared; diff --git a/app/views/Application/comparePlaces.html b/app/views/Application/comparePlaces.html index 624e65e..05d7e50 100644 --- a/app/views/Application/comparePlaces.html +++ b/app/views/Application/comparePlaces.html @@ -14,6 +14,7 @@

Choose a places file for comparison

#{/form}

Out of ${placesComparisonDTO.numPlacesCompared} there were ${placesComparisonDTO.numExactMatches} exact matches

+

Modified FOLG places there were ${placesComparisonDTO.numModifiedatches} exact matches

@@ -21,12 +22,16 @@

Out of ${placesComparisonDTO.numPlacesCompared} there were ${placesCompariso

+ + #{list items:placesComparisonDTO.displayPlaces, as: 'displayPlace'} + + #{/list} diff --git a/app/views/main.html b/app/views/main.html index d47b508..351645a 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -36,6 +36,10 @@ + + + #{get 'moreScripts' /} diff --git a/public/javascripts/sorttable.js b/public/javascripts/sorttable.js new file mode 100644 index 0000000..25bccb2 --- /dev/null +++ b/public/javascripts/sorttable.js @@ -0,0 +1,493 @@ +/* + SortTable + version 2 + 7th April 2007 + Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/ + + Instructions: + Download this file + Add to your HTML + Add class="sortable" to any table you'd like to make sortable + Click on the headers to sort + + Thanks to many, many people for contributions and suggestions. + Licenced as X11: http://www.kryogenix.org/code/browser/licence.html + This basically means: do what you want with it. +*/ + + +var stIsIE = /*@cc_on!@*/false; + +sorttable = { + init: function() { + // quit if this function has already been called + if (arguments.callee.done) return; + // flag this function so we don't do the same thing twice + arguments.callee.done = true; + // kill the timer + if (_timer) clearInterval(_timer); + + if (!document.createElement || !document.getElementsByTagName) return; + + sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/; + + forEach(document.getElementsByTagName('table'), function(table) { + if (table.className.search(/\bsortable\b/) != -1) { + sorttable.makeSortable(table); + } + }); + + }, + + makeSortable: function(table) { + if (table.getElementsByTagName('thead').length == 0) { + // table doesn't have a tHead. Since it should have, create one and + // put the first table row in it. + the = document.createElement('thead'); + the.appendChild(table.rows[0]); + table.insertBefore(the,table.firstChild); + } + // Safari doesn't support table.tHead, sigh + if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0]; + + if (table.tHead.rows.length != 1) return; // can't cope with two header rows + + // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as + // "total" rows, for example). This is B&R, since what you're supposed + // to do is put them in a tfoot. So, if there are sortbottom rows, + // for backwards compatibility, move them to tfoot (creating it if needed). + sortbottomrows = []; + for (var i=0; i5' : ' ▴'; + this.appendChild(sortrevind); + return; + } + if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) { + // if we're already sorted by this column in reverse, just + // re-reverse the table, which is quicker + sorttable.reverse(this.sorttable_tbody); + this.className = this.className.replace('sorttable_sorted_reverse', + 'sorttable_sorted'); + this.removeChild(document.getElementById('sorttable_sortrevind')); + sortfwdind = document.createElement('span'); + sortfwdind.id = "sorttable_sortfwdind"; + sortfwdind.innerHTML = stIsIE ? ' 6' : ' ▾'; + this.appendChild(sortfwdind); + return; + } + + // remove sorttable_sorted classes + theadrow = this.parentNode; + forEach(theadrow.childNodes, function(cell) { + if (cell.nodeType == 1) { // an element + cell.className = cell.className.replace('sorttable_sorted_reverse',''); + cell.className = cell.className.replace('sorttable_sorted',''); + } + }); + sortfwdind = document.getElementById('sorttable_sortfwdind'); + if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); } + sortrevind = document.getElementById('sorttable_sortrevind'); + if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); } + + this.className += ' sorttable_sorted'; + sortfwdind = document.createElement('span'); + sortfwdind.id = "sorttable_sortfwdind"; + sortfwdind.innerHTML = stIsIE ? ' 6' : ' ▾'; + this.appendChild(sortfwdind); + + // build an array to sort. This is a Schwartzian transform thing, + // i.e., we "decorate" each row with the actual sort key, + // sort based on the sort keys, and then put the rows back in order + // which is a lot faster because you only do getInnerText once per row + row_array = []; + col = this.sorttable_columnindex; + rows = this.sorttable_tbody.rows; + for (var j=0; j 12) { + // definitely dd/mm + return sorttable.sort_ddmm; + } else if (second > 12) { + return sorttable.sort_mmdd; + } else { + // looks like a date, but we can't tell which, so assume + // that it's dd/mm (English imperialism!) and keep looking + sortfn = sorttable.sort_ddmm; + } + } + } + } + return sortfn; + }, + + getInnerText: function(node) { + // gets the text we want to use for sorting for a cell. + // strips leading and trailing whitespace. + // this is *not* a generic getInnerText function; it's special to sorttable. + // for example, you can override the cell text with a customkey attribute. + // it also gets .value for fields. + + hasInputs = (typeof node.getElementsByTagName == 'function') && + node.getElementsByTagName('input').length; + + if (node.getAttribute("sorttable_customkey") != null) { + return node.getAttribute("sorttable_customkey"); + } + else if (typeof node.textContent != 'undefined' && !hasInputs) { + return node.textContent.replace(/^\s+|\s+$/g, ''); + } + else if (typeof node.innerText != 'undefined' && !hasInputs) { + return node.innerText.replace(/^\s+|\s+$/g, ''); + } + else if (typeof node.text != 'undefined' && !hasInputs) { + return node.text.replace(/^\s+|\s+$/g, ''); + } + else { + switch (node.nodeType) { + case 3: + if (node.nodeName.toLowerCase() == 'input') { + return node.value.replace(/^\s+|\s+$/g, ''); + } + case 4: + return node.nodeValue.replace(/^\s+|\s+$/g, ''); + break; + case 1: + case 11: + var innerText = ''; + for (var i = 0; i < node.childNodes.length; i++) { + innerText += sorttable.getInnerText(node.childNodes[i]); + } + return innerText.replace(/^\s+|\s+$/g, ''); + break; + default: + return ''; + } + } + }, + + reverse: function(tbody) { + // reverse the rows in a tbody + newrows = []; + for (var i=0; i=0; i--) { + tbody.appendChild(newrows[i]); + } + delete newrows; + }, + + /* sort functions + each sort function takes two parameters, a and b + you are comparing a[0] and b[0] */ + sort_numeric: function(a,b) { + aa = parseFloat(a[0].replace(/[^0-9.-]/g,'')); + if (isNaN(aa)) aa = 0; + bb = parseFloat(b[0].replace(/[^0-9.-]/g,'')); + if (isNaN(bb)) bb = 0; + return aa-bb; + }, + sort_alpha: function(a,b) { + if (a[0]==b[0]) return 0; + if (a[0] 0 ) { + var q = list[i]; list[i] = list[i+1]; list[i+1] = q; + swap = true; + } + } // for + t--; + + if (!swap) break; + + for(var i = t; i > b; --i) { + if ( comp_func(list[i], list[i-1]) < 0 ) { + var q = list[i]; list[i] = list[i-1]; list[i-1] = q; + swap = true; + } + } // for + b++; + + } // while(swap) + } +} + +/* ****************************************************************** + Supporting functions: bundled here to avoid depending on a library + ****************************************************************** */ + +// Dean Edwards/Matthias Miller/John Resig + +/* for Mozilla/Opera9 */ +if (document.addEventListener) { + document.addEventListener("DOMContentLoaded", sorttable.init, false); +} + +/* for Internet Explorer */ +/*@cc_on @*/ +/*@if (@_win32) + document.write("
Input Place Name FOLG Standardized Name FamilySearch Standardized NameExact MatchModified Name Matches
${displayPlace.inputPlace} ${displayPlace.fullName} ${displayPlace.standard_text}${displayPlace.wasExactMatch}${displayPlace.wasModifiedMatch}