mafoo.org.uk/wordbubbles
1
0
Fork 0
mirror of https://github.com/fooflington/wordbubbles.git synced 2025-10-30 21:08:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

allow dictionary picking

Browse Source
This commit is contained in:
foo
2016-02-15 20:39:49 +00:00
parent acd359f2be
commit 6e5eb2b2c5
2 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
war/solver.jsp
View File

@@ -8,7 +8,16 @@
// String dict = request.getParameter("dictionary");
// if(dict != "twl06") throw new Exception("failed to get dictionary");
String dict = "/usr/share/dict/twl06";
String dict_file = "words";
if(request.getParameter("dict") != null) {
if(request.getParameter("dict").matches("^[a-z\\-_]+$")) {
dict_file = request.getParameter("dict");
} else {
throw new Exception ("invalict dict paramter");
}
}
String dict = application.getRealPath("WEB-INF/dicts") + "/" + dict_file;
uk.org.mafoo.wordbubbles.Lexicon words = uk.org.mafoo.wordbubbles.Lexicon.loadLexiconFromFile(dict);
ArrayList<ArrayList<Character>> grid = new ArrayList<ArrayList<Character>>();
@@ -65,13 +74,18 @@ for ( LinkedHashSet<Cell> w : found ) {
%>
</table>
<% if(desired_active) { %> Looking for words of length(s): <%= desired %> <% } %>
<h2>Results</h2>
<% if(desired_active) { %> Looking for words of length(s): <%= desired %> <% } %><br />
Using dictionary: <%= dict_file %>
<ul style="font-family: monospace;">
<%
<%
List<String> output = new ArrayList<String>(foundwords);
Collections.sort(output);
%>
<h2>Results</h2>
Count: <%= output.size() %>
<ul style="font-family: monospace;">
<%
for (String word : output) { %>
<li><%= word %></li>
<% } %>