Don't try to index git submodules, they are seperate repositories and shoul...

Peter Allin

2012-08-07 a02998032e7077e3e744d5725485023097bf30f0

 src/com/gitblit/LuceneExecutor.java

@@ -69,6 +69,7 @@
import org.apache.lucene.util.Version;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.FileMode;

import org.eclipse.jgit.lib.ObjectId;

import org.eclipse.jgit.lib.ObjectLoader;

import org.eclipse.jgit.lib.ObjectReader;

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

   

      

   private static final int INDEX_VERSION = 4;

   private static final int INDEX_VERSION = 5;



   private static final String FIELD_OBJECT_TYPE = "type";

   private static final String FIELD_ISSUE = "issue";

@@ -412,7 +413,8 @@
      if (!deleteIndex(model.name)) {

         return result;

      }

      try {			
      try {

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

         FileBasedConfig config = getConfig(repository);

         Set<String> indexedCommits = new TreeSet<String>();

         IndexWriter writer = getIndexWriter(model.name);

@@ -492,7 +494,9 @@
            

            Map<String, ObjectId> paths = new TreeMap<String, ObjectId>();

            while (treeWalk.next()) {

               paths.put(treeWalk.getPathString(), treeWalk.getObjectId(0));

               if (treeWalk.getFileMode(0) != FileMode.GITLINK) {

                  paths.put(treeWalk.getPathString(), treeWalk.getObjectId(0));

               }

            }            



            ByteArrayOutputStream os = new ByteArrayOutputStream();

@@ -562,7 +566,7 @@
                     }

                     in.close();

                     byte[] content = os.toByteArray();

                     String str = new String(content, Constants.CHARACTER_ENCODING);

                     String str = StringUtils.decodeString(content, encodings);							
                     doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));

                     os.reset();

                  }