From a3d5b0d4c03d8112524494e190abc67e1043b5dd Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 6 Nov 2017 11:20:03 +0100
Subject: [PATCH] OO-3106: exclude large doc per default, fail fats if the
index directory doesn't exists, remove print out
---
.../qpool/manager/QuestionItemDocumentFactory.java | 1 -
.../java/org/olat/search/_spring/searchContext.xml | 2 ++
.../org/olat/search/service/SearchServiceImpl.java | 11 +++++++----
.../search/service/document/file/ExcelDocument.java | 6 ++----
.../service/document/file/FileDocumentFactory.java | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
index 58600b25e0a..830a331088e 100644
--- a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
+++ b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
@@ -87,7 +87,6 @@ public class QuestionItemDocumentFactory {
oDocument.setParentContextType(searchResourceContext.getParentContextType());
oDocument.setParentContextName(searchResourceContext.getParentContextName());
- System.out.println(item.getTitle());
//author
StringBuilder authorSb = new StringBuilder();
List<Identity> owners = qpoolService.getAuthors(item);
diff --git a/src/main/java/org/olat/search/_spring/searchContext.xml b/src/main/java/org/olat/search/_spring/searchContext.xml
index a006db5e9ba..20839505dfa 100644
--- a/src/main/java/org/olat/search/_spring/searchContext.xml
+++ b/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>
diff --git a/src/main/java/org/olat/search/service/SearchServiceImpl.java b/src/main/java/org/olat/search/service/SearchServiceImpl.java
index 81ddaacfe78..c4183b2b86c 100644
--- a/src/main/java/org/olat/search/service/SearchServiceImpl.java
+++ b/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;
}
diff --git a/src/main/java/org/olat/search/service/document/file/ExcelDocument.java b/src/main/java/org/olat/search/service/document/file/ExcelDocument.java
index 6f3f41e5ae1..80cde4c92bc 100644
--- a/src/main/java/org/olat/search/service/document/file/ExcelDocument.java
+++ b/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++;
}
}
diff --git a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java b/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
index 3ec43c2c64d..6a8e9427bbe 100644
--- a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
+++ b/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;
}
--
GitLab