codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extracted writeBanksToIndex() and catching exceptions during indexing

This commit is contained in:
dankito 2020-04-24 13:44:25 +02:00
parent 75ffcabd0d
commit 29afad0a15
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fints4javaLib/src/main/kotlin/net/dankito/fints/banks/LuceneBankFinder.kt
View File

@ -11,6 +11,7 @@ import net.dankito.utils.lucene.search.QueryBuilder
import net.dankito.utils.lucene.search.Searcher import net.dankito.utils.lucene.search.Searcher
import org.apache.lucene.document.Document import org.apache.lucene.document.Document
import org.apache.lucene.search.Query import org.apache.lucene.search.Query
import org.slf4j.LoggerFactory
import java.io.File import java.io.File
@ -33,6 +34,9 @@ open class LuceneBankFinder(indexFolder: File) : BankFinderBase(), IBankFinder {
const val BankInfoPinTanVersionFieldName = "pin_tan_version" const val BankInfoPinTanVersionFieldName = "pin_tan_version"
const val BankInfoOldBankCodeFieldName = "old_bank_code" const val BankInfoOldBankCodeFieldName = "old_bank_code"
private val log = LoggerFactory.getLogger(LuceneBankFinder::class.java)
} }
@ -143,27 +147,34 @@ open class LuceneBankFinder(indexFolder: File) : BankFinderBase(), IBankFinder {
} }
protected open fun updateIndex(bankListFileHash: String) { protected open fun updateIndex(bankListFileHash: String) {
val banks = loadBankListFile() try {
val banks = loadBankListFile()
// while indexing - which takes a long time on Android - use InMemoryBankFinder so that user sees at least some search results even though it's slower // while indexing - which takes a long time on Android - use InMemoryBankFinder so that user sees at least some search results even though it's slower
bankFinderWhileUpdatingIndex = InMemoryBankFinder(banks) bankFinderWhileUpdatingIndex = InMemoryBankFinder(banks)
fileUtils.deleteFolderRecursively(indexDir) fileUtils.deleteFolderRecursively(indexDir) // delete current index
indexDir.mkdirs() indexDir.mkdirs()
writeBanksToIndex(banks, bankListFileHash)
bankFinderWhileUpdatingIndex = null // now use LuceneBankFinder again for searching
} catch (e: Exception) {
log.error("Could not update index", e)
}
}
protected open fun writeBanksToIndex(banks: List<BankInfo>, bankListFileHash: String) {
DocumentsWriter(indexDir).use { writer -> DocumentsWriter(indexDir).use { writer ->
writer.saveDocuments(banks.map { writer.saveDocuments(banks.map {
createDocumentForBank(it, writer) createDocumentForBank(it, writer)
} ) })
writer.updateDocument(IndexedBankListFileHashIdFieldName, IndexedBankListFileHashIdFieldValue, writer.updateDocument(IndexedBankListFileHashIdFieldName, IndexedBankListFileHashIdFieldValue,
fields.storedField(IndexedBankListFileHashFieldName, bankListFileHash) fields.storedField(IndexedBankListFileHashFieldName, bankListFileHash))
)
writer.optimizeIndex() writer.optimizeIndex()
} }
bankFinderWhileUpdatingIndex = null
} }
protected open fun createDocumentForBank(bank: BankInfo, writer: DocumentsWriter): Document { protected open fun createDocumentForBank(bank: BankInfo, writer: DocumentsWriter): Document {