Added setting to control Groovy Grape folder (issue 91)

James Moger

2012-06-18 67d4f89b0cddb3de05c20e08c20f1bea714c2a9e

 src/com/gitblit/LuceneExecutor.java

@@ -73,6 +73,7 @@
import org.eclipse.jgit.lib.ObjectLoader;

import org.eclipse.jgit.lib.ObjectReader;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.lib.RepositoryCache.FileKey;

import org.eclipse.jgit.revwalk.RevCommit;

import org.eclipse.jgit.revwalk.RevTree;

import org.eclipse.jgit.revwalk.RevWalk;

@@ -104,7 +105,7 @@
public class LuceneExecutor implements Runnable {

   

      

   private static final int INDEX_VERSION = 2;

   private static final int INDEX_VERSION = 3;



   private static final String FIELD_OBJECT_TYPE = "type";

   private static final String FIELD_ISSUE = "issue";

@@ -641,6 +642,7 @@
         String branch, RevCommit commit) {

      IndexResult result = new IndexResult();

      try {

         String [] encodings = storedSettings.getStrings(Keys.web.blobEncodings).toArray(new String[0]);

         List<PathChangeModel> changedPaths = JGitUtils.getFilesInCommit(repository, commit);

         String revDate = DateTools.timeToString(commit.getCommitTime() * 1000L,

               Resolution.MINUTE);

@@ -673,7 +675,7 @@
               if (StringUtils.isEmpty(ext) || !excludedExtensions.contains(ext)) {

                  // read the blob content

                  String str = JGitUtils.getStringContent(repository, commit.getTree(),

                        path.path);

                        path.path, encodings);

                  doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));

                  writer.addDocument(doc);

               }

@@ -1042,8 +1044,8 @@
    * @throws IOException

    */

   private IndexWriter getIndexWriter(String repository) throws IOException {

      IndexWriter indexWriter = writers.get(repository);		
      File repositoryFolder = new File(repositoriesFolder, repository);

      IndexWriter indexWriter = writers.get(repository);				
      File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repository), FS.DETECTED);

      File indexFolder = new File(repositoryFolder, LUCENE_DIR);

      Directory directory = FSDirectory.open(indexFolder);