Repository-branch Lucene indexing is now opt-in

James Moger

2012-03-16 40ca5c51d1006cd1badf5393f20921b2047f4701

 src/com/gitblit/wicket/pages/LucenePage.java

@@ -20,17 +20,24 @@


import org.apache.wicket.PageParameters;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.ListMultipleChoice;

import org.apache.wicket.markup.html.form.StatelessForm;

import org.apache.wicket.markup.html.form.TextField;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.apache.wicket.model.Model;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.lib.Constants;



import com.gitblit.Constants.SearchType;

import com.gitblit.GitBlit;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.SearchResult;

import com.gitblit.utils.LuceneUtils;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.LinkPanel;



@@ -48,7 +55,99 @@


   private void setup(PageParameters params) {

      setupPage("", "");

		
      // default values

      ArrayList<String> repositories = new ArrayList<String>();				
      String query = "";



      if (params != null) {

         String repository = WicketUtils.getRepositoryName(params);

         if (!StringUtils.isEmpty(repository)) {

            repositories.add(repository);

         }

			
         if (params.containsKey("repositories")) {

            String value = params.getString("repositories", "");

            List<String> list = StringUtils.getStringsFromValue(value);			
            repositories.addAll(list);

         }



         if (params.containsKey("query")) {

            query = params.getString("query", "");	
         } else {

            String value = WicketUtils.getSearchString(params);

            String type = WicketUtils.getSearchType(params);

            com.gitblit.Constants.SearchType searchType = com.gitblit.Constants.SearchType.forName(type);

            if (!StringUtils.isEmpty(value)) {

               if (searchType == SearchType.COMMIT) {

                  query = "type:" + searchType.name().toLowerCase() + " AND \"" + value + "\"";	
               } else {

                  query = searchType.name().toLowerCase() + ":\"" + value + "\"";

               }

            }

         }

      }

		
      // display user-accessible selections

      UserModel user = GitBlitWebSession.get().getUser();

      List<String> availableRepositories = new ArrayList<String>();

      for (RepositoryModel model : GitBlit.self().getRepositoryModels(user)) {

         if (model.hasCommits && !ArrayUtils.isEmpty(model.indexedBranches)) {

            availableRepositories.add(model.name);

         }

      }

		
      if (availableRepositories.size() == 0) {

         info(getString("gb.noIndexedRepositoriesWarning"));

      }



      // enforce user-accessible repository selections

      ArrayList<String> searchRepositories = new ArrayList<String>();

      for (String selectedRepository : repositories) {

         if (availableRepositories.contains(selectedRepository)) {

            searchRepositories.add(selectedRepository);

         }

      }

		
      // search form

      final Model<String> queryModel = new Model<String>(query);

      final Model<ArrayList<String>> repositoriesModel = new Model<ArrayList<String>>(searchRepositories);

      StatelessForm<Void> form = new StatelessForm<Void>("searchForm") {

			
         private static final long serialVersionUID = 1L;



         @Override

         public void onSubmit() {

            String q = queryModel.getObject();

            if (StringUtils.isEmpty(q)) {

               error(getString("gb.undefinedQueryWarning"));

               return;

            }				
            if (repositoriesModel.getObject().size() == 0) {

               error(getString("gb.noSelectedRepositoriesWarning"));

               return;

            }

            PageParameters params = new PageParameters();

            params.put("repositories", StringUtils.flattenStrings(repositoriesModel.getObject()));

            params.put("query", queryModel.getObject());

            setResponsePage(LucenePage.class, params);

         }

      };

				
      ListMultipleChoice<String> selections = new ListMultipleChoice<String>("repositories", 
            repositoriesModel, availableRepositories, new StringChoiceRenderer());

      selections.setMaxRows(10);

      form.add(selections);

      form.add(new TextField<String>("query", queryModel));

      add(form);

				
      // execute search

      final List<SearchResult> results = new ArrayList<SearchResult>();

      if (!ArrayUtils.isEmpty(searchRepositories) && !StringUtils.isEmpty(query)) {

         results.addAll(GitBlit.self().search(query, 100, searchRepositories));

      }

		
      // search results view

      ListDataProvider<SearchResult> resultsDp = new ListDataProvider<SearchResult>(results);

      final DataView<SearchResult> resultsView = new DataView<SearchResult>("searchResults", resultsDp) {

         private static final long serialVersionUID = 1L;

@@ -59,51 +158,31 @@
               Label icon = WicketUtils.newIcon("type", "icon-refresh");

               WicketUtils.setHtmlTooltip(icon, "commit");

               item.add(icon);

               item.add(new LinkPanel("summary", null, sr.summary, CommitPage.class, WicketUtils.newObjectParameter(sr.repository, sr.id)));

               item.add(new LinkPanel("summary", null, sr.summary, CommitPage.class, WicketUtils.newObjectParameter(sr.repository, sr.commitId)));

               break;

            }

            case blob: {

               Label icon = WicketUtils.newIcon("type", "icon-file");

               WicketUtils.setHtmlTooltip(icon, "blob");

               item.add(icon);

               item.add(new LinkPanel("summary", null, sr.id, BlobPage.class, WicketUtils.newPathParameter(sr.repository, sr.branch, sr.id)));

               item.add(new LinkPanel("summary", null, sr.path, BlobPage.class, WicketUtils.newPathParameter(sr.repository, sr.branch, sr.path)));

               break;

            }

            case issue: {

               Label icon = WicketUtils.newIcon("type", "icon-file");

               WicketUtils.setHtmlTooltip(icon, "issue");

               item.add(icon);

               item.add(new Label("summary", "issue: " + sr.id));

               item.add(new Label("summary", "issue: " + sr.issueId));

               break;

            }

            }

            item.add(new Label("repository", sr.repository));

            item.add(new Label("branch", sr.branch));

            item.add(new Label("fragment", sr.fragment).setEscapeModelStrings(false).setVisible(!StringUtils.isEmpty(sr.fragment)));

            item.add(new LinkPanel("repository", null, sr.repository, SummaryPage.class, WicketUtils.newRepositoryParameter(sr.repository)));

            item.add(new LinkPanel("branch", "branch", StringUtils.getRelativePath(Constants.R_HEADS, sr.branch), LogPage.class, WicketUtils.newObjectParameter(sr.repository, sr.branch)));

            item.add(new Label("author", sr.author));

            item.add(WicketUtils.createTimestampLabel("date", sr.date, getTimeZone()));

         }

      };		
		
      final Model<String> fragment = new Model<String>();

      Form<Void> form = new Form<Void>("searchForm") {

         @Override

         public void onSubmit() {

            String f = fragment.getObject();

            List<Repository> repositories = new ArrayList<Repository>();

            for (String r : GitBlit.self().getRepositoryList()) {

               repositories.add(GitBlit.self().getRepository(r));

            }

            List<SearchResult> srs = LuceneUtils.search(f, 100, repositories.toArray(new Repository[repositories.size()]));

            results.clear();

            results.addAll(srs);

            for (Repository r : repositories) {

               r.close();

            }

            resultsView.setVisible(true);

            item.add(WicketUtils.createDatestampLabel("date", sr.date, getTimeZone()));

         }

      };

      form.add(new TextField<String>("fragment", fragment));

      add(form);

      add(resultsView.setVisible(false));

   }

      add(resultsView.setVisible(results.size() > 0));

   }	
}