From 83b55b7801cbf1c37971eb530ddf9b0f46a11536 Mon Sep 17 00:00:00 2001 From: Kensuke Matsuzaki <zakki@peppermint.jp> Date: Sun, 25 Mar 2012 17:25:04 -0400 Subject: [PATCH] Add Japanese massages --- src/com/gitblit/GitBlit.java | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index f6691dc..7b557d7 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -73,6 +73,7 @@ import com.gitblit.models.FederationSet; import com.gitblit.models.Metric; import com.gitblit.models.RepositoryModel; +import com.gitblit.models.SearchResult; import com.gitblit.models.ServerSettings; import com.gitblit.models.ServerStatus; import com.gitblit.models.SettingModel; @@ -184,6 +185,7 @@ } return self().timezone; } + /** * Returns the boolean value for the specified key. If the key does not @@ -809,6 +811,8 @@ "gitblit", null, "postReceiveScript"))); model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList( "gitblit", null, "mailingList"))); + model.indexedBranches = new ArrayList<String>(Arrays.asList(config.getStringList( + "gitblit", null, "indexBranch"))); } model.HEAD = JGitUtils.getHEADRef(r); model.availableRefs = JGitUtils.getAvailableHeadTargets(r); @@ -868,6 +872,9 @@ repository.close(); } } + + // close any open index writer/searcher in the Lucene executor + luceneExecutor.close(repositoryName); } /** @@ -1056,6 +1063,9 @@ } if (!ArrayUtils.isEmpty(repository.mailingLists)) { config.setStringList("gitblit", null, "mailingList", repository.mailingLists); + } + if (!ArrayUtils.isEmpty(repository.indexedBranches)) { + config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches); } try { config.save(); @@ -1645,6 +1655,20 @@ } return scripts; } + + /** + * Search the specified repositories using the Lucene query. + * + * @param query + * @param page + * @param pageSize + * @param repositories + * @return + */ + public List<SearchResult> search(String query, int page, int pageSize, List<String> repositories) { + List<SearchResult> srs = luceneExecutor.search(query, page, pageSize, repositories); + return srs; + } /** * Notify the administrators by email. @@ -1694,15 +1718,6 @@ } catch (MessagingException e) { logger.error("Messaging error", e); } - } - - /** - * Update the Lucene index of a repository. - * - * @param repository - */ - public void updateLuceneIndex(RepositoryModel repository) { - luceneExecutor.queue(repository); } /** @@ -1822,13 +1837,9 @@ } else { logger.warn("Mail server is not properly configured. Mail services disabled."); } - luceneExecutor = new LuceneExecutor(settings); - if (luceneExecutor.isReady()) { - logger.info("Lucene executor is scheduled to process the repository queue every 2 minutes."); - scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES); - } else { - logger.warn("Lucene executor is disabled."); - } + luceneExecutor = new LuceneExecutor(settings, repositoriesFolder); + logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes."); + scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES); if (startFederation) { configureFederation(); } -- Gitblit v1.9.1