Search results with statistics

app/src/main/AndroidManifest.xml

@@ -119,6 +119,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:label="@string/search"
             />
+        <activity
+            android:name="net.bible.android.view.activity.search.MySearchResults"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale"
+            android:label="@string/search"
+            />
         <activity
             android:name="net.bible.android.view.activity.search.SearchIndex"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"

app/src/main/java/net/bible/android/control/link/LinkControl.kt

@@ -31,6 +31,7 @@ import net.bible.android.control.search.SearchControl.SearchBibleSection
 import net.bible.android.view.activity.base.CurrentActivityHolder
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.BibleView
+import net.bible.android.view.activity.search.MySearchResults
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchResults
 import net.bible.service.common.CommonUtils.settings
@@ -279,7 +280,7 @@ class LinkControl @Inject constructor(
         intent = if (needToIndex) {
             Intent(activity, SearchIndex::class.java)
         } else { //If an indexed Strong's module is in place then do the search - the normal situation
-            Intent(activity, SearchResults::class.java)
+            Intent(activity, MySearchResults::class.java)
         }
         intent.putExtras(searchParams)
         activity.startActivity(intent)

app/src/main/java/net/bible/android/control/page/window/ActiveWindowPageManagerProvider.kt

@@ -22,3 +22,7 @@ import net.bible.android.control.page.CurrentPageManager
 /**
  * @author Martin Denham [mjdenham at gmail dot com]
  */
+
+//interface ActiveWindowPageManagerProvider {
+//    val activeWindowPageManager: CurrentPageManager
+//}

app/src/main/java/net/bible/android/control/search/SearchControl.kt

@@ -26,10 +26,14 @@ import net.bible.android.control.versification.Scripture
 import net.bible.android.view.activity.search.Search
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchResultsDto
+import net.bible.service.common.CommonUtils.limitTextLength
+import net.bible.service.sword.SwordContentFacade.getPlainText
+import net.bible.service.sword.SwordContentFacade.readOsisFragment
 import net.bible.service.sword.SwordContentFacade.search
 import net.bible.service.sword.SwordDocumentFacade
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.book.Book
+import org.crosswire.jsword.book.BookCategory
 import org.crosswire.jsword.book.BookException
 import org.crosswire.jsword.book.basic.AbstractPassageBook
 import org.crosswire.jsword.book.sword.SwordBook
@@ -38,6 +42,7 @@ import org.crosswire.jsword.index.lucene.LuceneIndex
 import org.crosswire.jsword.index.search.SearchType
 import org.crosswire.jsword.passage.Key
 import org.crosswire.jsword.passage.Verse
+import org.jdom2.Element
 import javax.inject.Inject
 
 /** Support for the document search functionality
@@ -52,6 +57,7 @@ class SearchControl @Inject constructor(
     )
 {
     private val isSearchShowingScripture = true
+    var isStrongsSearch: Boolean = false
 
     enum class SearchBibleSection {
         OT, NT, CURRENT_BOOK, ALL
@@ -95,11 +101,33 @@ class SearchControl @Inject constructor(
             "-"
         }
 
-    fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?): String {
-        val cleanSearchString = cleanSearchString(searchString)
+    fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?,
+                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null,
+                             strongs: Char? = null): String {
+        var cleanSearchString = cleanSearchString(searchString)
+        isStrongsSearch = strongs != null
+        if (includeAllEndings || isStrongsSearch || fuzzySearchAccuracy != null) {
+            var newSearchString = ""
+            val wordArray: List<String> = cleanSearchString.split(" ")
+            for (it in wordArray) {
+                var decoratedWord = it
+                if (includeAllEndings) decoratedWord += "* "
+                if (isStrongsSearch) decoratedWord = "strong:$strongs$decoratedWord "
+                if (fuzzySearchAccuracy != null) {
+                    val fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1.0)) 0.99 else fuzzySearchAccuracy
+                    decoratedWord += "~%.2f ".format(fuzzySearchAccuracyAdjusted)
+                }
+                newSearchString += decoratedWord
+            }
+            cleanSearchString = newSearchString.trim()
+        }
+
+        if (proximityWords != null) {
+            cleanSearchString = "\"$cleanSearchString\"~$proximityWords"
+        }
 
         // add search type (all/any/phrase) to search string
-        var decorated: String = searchType.decorate(cleanSearchString)
+        var decorated = searchType.decorate(cleanSearchString)
         originalSearchString = decorated
 
         // add bible section limitation to search text
@@ -139,6 +167,43 @@ class SearchControl @Inject constructor(
         return searchResults
     }
 
+    fun getSearchResultVerseText(key: Key?): String {
+        // There is similar functionality in BookmarkControl
+        // This is much slower than 'getSearchResultVerseElement'. Why? In the old version this was VERY fast.
+        var verseText = ""
+        try {
+            val doc = windowControl.activeWindowPageManager.currentPage.currentDocument
+            val cat = doc!!.bookCategory
+            verseText = if (cat == BookCategory.BIBLE || cat == BookCategory.COMMENTARY) {
+                getPlainText(doc, key)
+            } else {
+                val bible = windowControl.activeWindowPageManager.currentBible.currentDocument!!
+                getPlainText(bible, key)
+            }
+            verseText = limitTextLength(verseText)!!
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting verse text", e)
+        }
+        return verseText
+    }
+
+    fun getSearchResultVerseElement(key: Key?): Element {
+        // There is similar functionality in BookmarkControl
+        var xmlVerse:Element? = null
+        try {
+            val doc = windowControl.activeWindowPageManager.currentPage.currentDocument
+            val cat = doc!!.bookCategory
+            xmlVerse = if (cat == BookCategory.BIBLE || cat == BookCategory.COMMENTARY) {
+                readOsisFragment(doc, key)
+            } else {
+                val bible = windowControl.activeWindowPageManager.currentBible.currentDocument!!
+                readOsisFragment(bible, key)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting verse text", e)
+        }
+        return xmlVerse!!
+    }
     /** double spaces, :, and leading or trailing space cause lucene errors
      */
     private fun cleanSearchString(search: String): String {
@@ -212,7 +277,7 @@ class SearchControl @Inject constructor(
         const val TARGET_DOCUMENT = "TargetDocument"
         private const val STRONG_COLON_STRING = LuceneIndex.FIELD_STRONG + ":"
         private const val STRONG_COLON_STRING_PLACE_HOLDER = LuceneIndex.FIELD_STRONG + "COLON"
-        const val MAX_SEARCH_RESULTS = 1000
+        const val MAX_SEARCH_RESULTS = 10000
         private const val TAG = "SearchControl"
     }
 }

app/src/main/java/net/bible/android/view/activity/ActivityComponent.kt

@@ -41,6 +41,7 @@ import net.bible.android.view.activity.page.screen.DocumentViewManager
 import net.bible.android.view.activity.readingplan.DailyReading
 import net.bible.android.view.activity.readingplan.DailyReadingList
 import net.bible.android.view.activity.readingplan.ReadingPlanSelectorList
+import net.bible.android.view.activity.search.MySearchResults
 import net.bible.android.view.activity.search.Search
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchIndexProgressStatus
@@ -102,6 +103,7 @@ interface ActivityComponent {
     fun inject(w: SpeakTransportWidget)
     fun inject(search: Search)
     fun inject(searchResults: SearchResults)
+    fun inject(mySearchResults: MySearchResults)
     fun inject(history: History)
 
     // Services

app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt

@@ -320,10 +320,10 @@ class GridChoosePassageBook : CustomTitlebarActivityBase(R.menu.choose_passage_b
         private val HISTORY_COLOR = Color.rgb(0xFE, 0xCC, 0x9B)
         private val WISDOM_COLOR = Color.rgb(0x99, 0xFF, 0x99)
         private val MAJOR_PROPHETS_COLOR = Color.rgb(0xFF, 0x99, 0xFF)
-        private val MINOR_PROPHETS_COLOR = Color.rgb(0xFF, 0xFE, 0xCD)
+        private val MINOR_PROPHETS_COLOR = Color.rgb(0xE6, 0xE5, 0xB8)
         private val GOSPEL_COLOR = Color.rgb(0xFF, 0x97, 0x03)
         private val ACTS_COLOR = Color.rgb(0x00, 0x99, 0xFF)
-        private val PAULINE_COLOR = Color.rgb(0xFF, 0xFF, 0x31)
+        private val PAULINE_COLOR = Color.rgb(0xF5, 0xf5, 0x21)
         private val GENERAL_EPISTLES_COLOR = Color.rgb(0x67, 0xCC, 0x66) // changed 99 to CC to make a little clearer on dark background
         private val REVELATION_COLOR = Color.rgb(0xFE, 0x33, 0xFF)
         private val OTHER_COLOR = ACTS_COLOR