From 3d0494ad6db80843add9bf9d6eac783a691ac5a1 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 09 Mar 2012 20:45:52 -0500 Subject: [PATCH] More Lucene progress --- src/com/gitblit/wicket/GitBlitWebApp.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java index e2391d6..5054afa 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/com/gitblit/wicket/GitBlitWebApp.java @@ -26,6 +26,7 @@ import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.wicket.pages.ActivityPage; +import com.gitblit.wicket.pages.BasePage; import com.gitblit.wicket.pages.BlamePage; import com.gitblit.wicket.pages.BlobDiffPage; import com.gitblit.wicket.pages.BlobPage; @@ -90,7 +91,12 @@ mount("/commitdiff", CommitDiffPage.class, "r", "h"); mount("/patch", PatchPage.class, "r", "h", "f"); mount("/history", HistoryPage.class, "r", "h", "f"); - mount("/search", SearchPage.class); + if (GitBlit.getBoolean(Keys.lucene.enable, false)) { + // TODO switch this to LucenePage when it is ready + mount("/search", SearchPage.class); + } else { + mount("/search", SearchPage.class); + } mount("/metrics", MetricsPage.class, "r"); mount("/blame", BlamePage.class, "r", "h", "f"); @@ -124,6 +130,20 @@ public Class<? extends Page> getHomePage() { return RepositoriesPage.class; } + + /** + * Returns the preferred search page class. + * + * @return a Wicket class representing a search page + */ + public Class<? extends BasePage> getSearchPageClass() { + if (GitBlit.getBoolean(Keys.lucene.enable, false)) { + // TODO switch this to LucenePage when it is ready + return SearchPage.class;//LucenePage.class; + } + return SearchPage.class; + } + @Override public final Session newSession(Request request, Response response) { -- Gitblit v1.9.1