version 2.7.1 issue #35

bireme · Oct 24, 2019 · f1a602a · f1a602a
1 parent 0a4a486
commit f1a602a
Show file tree

Hide file tree

Showing 37 changed files with 4 additions and 65 deletions.
diff --git a/SDService/build/web/WEB-INF/lib/SimilarDocs-assembly-0.1.0.jar b/SDService/build/web/WEB-INF/lib/SimilarDocs-assembly-0.1.0.jar
diff --git a/SDService/dist/SDService.war b/SDService/dist/SDService.war
diff --git a/poc1.txt b/poc1.txt
diff --git a/poc10.txt b/poc10.txt
diff --git a/poc11.txt b/poc11.txt
diff --git a/poc12.txt b/poc12.txt
diff --git a/poc13.txt b/poc13.txt
diff --git a/poc14.txt b/poc14.txt
diff --git a/poc15.txt b/poc15.txt
diff --git a/poc16.txt b/poc16.txt
diff --git a/poc17.txt b/poc17.txt
diff --git a/poc18.txt b/poc18.txt
diff --git a/poc19.txt b/poc19.txt
diff --git a/poc2.txt b/poc2.txt
diff --git a/poc20.txt b/poc20.txt
diff --git a/poc21.txt b/poc21.txt
diff --git a/poc22.txt b/poc22.txt
diff --git a/poc23.txt b/poc23.txt
diff --git a/poc24.txt b/poc24.txt
diff --git a/poc25.txt b/poc25.txt
diff --git a/poc26.txt b/poc26.txt
diff --git a/poc27.txt b/poc27.txt
diff --git a/poc28.txt b/poc28.txt
diff --git a/poc29.txt b/poc29.txt
diff --git a/poc3.txt b/poc3.txt
diff --git a/poc30.txt b/poc30.txt
diff --git a/poc31.txt b/poc31.txt
diff --git a/poc32.txt b/poc32.txt
diff --git a/poc33.txt b/poc33.txt
diff --git a/poc34.txt b/poc34.txt
diff --git a/poc35.txt b/poc35.txt
diff --git a/poc4.txt b/poc4.txt
diff --git a/poc5.txt b/poc5.txt
diff --git a/poc6.txt b/poc6.txt
diff --git a/poc7.txt b/poc7.txt
diff --git a/poc8.txt b/poc8.txt
diff --git a/src/main/scala/org/bireme/sd/LuceneIndexAkka.scala b/src/main/scala/org/bireme/sd/LuceneIndexAkka.scala
@@ -66,22 +66,12 @@ class LuceneIndexMain(indexPath: String,
 
   val modFile = new File(modifiedIndexPath)
   if (!modFile.exists()) modFile.mkdirs()
-  if (fullIndexing) {
-    new File(modFile, "fileLastModified.db").delete()
-    new File(modFile, "docLastModified.db").delete()
-  }
+  if (fullIndexing) new File(modFile, "docLastModified.db").delete()
 
-  val fileLastModified: MVStore = new MVStore.Builder().fileName(s"$modifiedIndexPath/fileLastModified.db")
-    .compress().open()
   val docLastModified: MVStore = new MVStore.Builder().fileName(s"$modifiedIndexPath/docLastModified.db")
     .compress().open()
-
-  val lastModifiedFile: MVMap[String, Long] = fileLastModified.openMap("modFile")
   val lastModifiedDoc: MVMap[String, Long] = docLastModified.openMap("modDoc")
-  if (fullIndexing) {
-    lastModifiedFile.clear()
-    lastModifiedDoc.clear()
-  }
+  if (fullIndexing) lastModifiedDoc.clear()
 
   val excludeDays: Int = 2 // Number of days to remove from the last iahx update day
   val excludeTime: Long = excludeDays * 24 * 60 * 60 * 1000  // excludeDays in miliseconds
@@ -149,21 +139,8 @@ class LuceneIndexMain(indexPath: String,
     new File(xmlDir).listFiles().sorted.foreach {
       file =>
         if (file.isFile) {
-          val fname = file.getName
-          matcher.reset(fname)
-          if (matcher.matches) {
-            val fileLastModified: Long = file.lastModified()
-            Option(lastModifiedFile.get(fname)) match {
-              case Some(modified: Long) =>
-                if (fileLastModified > modified) {
-                  indexFile(file.getPath, encoding)
-                  lastModifiedFile.put(fname, fileLastModified)
-                }
-              case _ =>
-                indexFile(file.getPath, encoding)
-                lastModifiedFile.put(fname, fileLastModified)
-            }
-          }
+          matcher.reset(file.getName)
+          if (matcher.matches) indexFile(file.getPath, encoding)
         }
     }
   }
@@ -174,7 +151,6 @@ class LuceneIndexMain(indexPath: String,
     indexWriter.close()
     directory.close()
     log.info("Optimizing index 'sdIndex - end'")
-    fileLastModified.close()
     docLastModified.close()
     context.system.terminate()
   }