refactor new ?analyzer= feature.

src/main/java/com/github/rnewson/couchdb/lucene/DatabaseIndexer.java

@@ -126,12 +126,16 @@ public void returnSearcher(final IndexSearcher searcher)
 			returnReader(searcher.getIndexReader());
 		}
 
-		public Query parse(final String query, final Analyzer analyzer) throws ParseException {
+		public Query parse(final String query, final Analyzer analyzer) throws ParseException, JSONException {
 			final QueryParser parser = new CustomQueryParser(Constants.VERSION,
 					Constants.DEFAULT_FIELD, analyzer);
 			return parser.parse(query);
 		}
 
+		public Analyzer analyzer(final String analyzerName) throws JSONException {
+		    return analyzerName == null ? this.analyzer : Analyzers.getAnalyzer(analyzerName);
+		}
+
 		private synchronized void close() throws IOException {
 			if (reader != null)
 				reader.close();
@@ -469,14 +473,14 @@ public void search(final HttpServletRequest req,
 				return;
 			}
 			for (final String queryString : getQueryStrings(req)) {
-				final Analyzer analyzer = getAnalyzer(req, state.analyzer);
+				final Analyzer analyzer = state.analyzer(req.getParameter("analyzer"));
 				final Query q = state.parse(queryString, analyzer);
-				
+
 				final JSONObject queryRow = new JSONObject();
 				queryRow.put("q", q.toString());
 				if (getBooleanParameter(req, "debug")) {
 					queryRow.put("plan", QueryPlan.toPlan(q));
-					queryRow.put("analyzer", state.analyzer.getClass());
+					queryRow.put("analyzer", analyzer.getClass());
 				}
 				queryRow.put("etag", etag);
 				if (getBooleanParameter(req, "rewrite")) {
@@ -777,11 +781,6 @@ private void init() throws IOException, JSONException {
 	private boolean isStaleOk(final HttpServletRequest req) {
 		return "ok".equals(req.getParameter("stale"));
 	}
-
-	private Analyzer getAnalyzer(final HttpServletRequest req, final Analyzer defaultAnalyzer) throws JSONException {
-		final String analyzer = req.getParameter("analyzer");
-		return analyzer == null ? defaultAnalyzer : Analyzers.getAnalyzer(analyzer);
-	}
 
 	private void maybeCommit() throws IOException {
 		if (now() - lastCommit >= getCommitInterval()) {