Merge OpenOLAT 12.1 to OpenOLAT default branch with d45704c85928fc6594b45279fc6801f998dc3d72

src/main/java/org/olat/search/_spring/searchContext.xml

@@ -80,6 +80,8 @@
 			<list>
 				<!-- list of files which will not be indexed -->
 				<value>ppt</value>
+				<value>doc</value>
+				<value>xls</value>
 			</list>
 		</constructor-arg>
 	</bean>

src/main/java/org/olat/search/service/SearchServiceImpl.java

@@ -598,10 +598,13 @@ public class SearchServiceImpl implements SearchService, GenericEventListener {
 	throws IOException {
 		try {
 			File indexFile = new File(searchModuleConfig.getFullIndexPath());
-			Directory directory = FSDirectory.open(indexFile);
-			File permIndexFile = new File(searchModuleConfig.getFullPermanentIndexPath());
-			Directory permDirectory = FSDirectory.open(permIndexFile);
-			return DirectoryReader.indexExists(directory) && DirectoryReader.indexExists(permDirectory);
+			if(indexFile.exists()) {
+				Directory directory = FSDirectory.open(indexFile);
+				File permIndexFile = new File(searchModuleConfig.getFullPermanentIndexPath());
+				Directory permDirectory = FSDirectory.open(permIndexFile);
+				return DirectoryReader.indexExists(directory) && DirectoryReader.indexExists(permDirectory);
+			}
+			return false;
 		} catch (IOException e) {
 			throw e;
 		}

src/main/java/org/olat/search/service/document/file/ExcelDocument.java

@@ -34,7 +34,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.olat.core.gui.util.CSSHelper;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
@@ -87,12 +87,10 @@ public class ExcelDocument extends FileDocument {
 							for (int cellNumber = row.getFirstCellNum(); cellNumber <= row.getLastCellNum(); cellNumber++) {
 								HSSFCell cell = row.getCell(cellNumber);
 								if (cell != null) {
-									// if (cell.getCellStyle().equals(HSSFCell.CELL_TYPE_NUMERIC))
-									if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+									if (cell.getCellTypeEnum() == CellType.STRING) {
 										content.append(cell.getStringCellValue()).append(' ');
 									}
 								} else {
-									// throw new DocumentException();
 									cellNullCounter++;
 								}
 							}

src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java

@@ -249,7 +249,7 @@ public class FileDocumentFactory {
 		if (searchModule.getFileSizeSuffixes().contains(suffix)) {
 			long maxFileSize = searchModule.getMaxFileSize();
 			if ( (maxFileSize != 0) && (fileSize > maxFileSize) ) {
-				log.info("File too big, exlude from search index. filename=" + fileName);
+				log.info("File too big, exclude from search index. filename=" + fileName);
 				excludedFileSizeCount++;
 				return false;
 			}