Merge pull request #1185 from mlibrary/epub-search-cfi-ranges

Work towards resolving #1162, highlighting search terms in CSB. One of

app/services/e_pubs_search_service.rb

@@ -28,14 +28,27 @@ def walk_up_dom(el, cfi, i)
     end
   end
 
-  def snippet(e, q)
-    p0 = e.text.downcase.index(q.downcase)
-    p1 = p0 + q.length
+  def snippet(e, p0, p1)
     before = e.text[p0 - 30..p0 - 1]
     after  = e.text[p1 + 1..p1 + 30]
     "...#{before}#{e.text[p0..p1]}#{after}..."
   end
 
+  def find_hits(e, q, offset, hits)
+    p0 = e.text.downcase.index(q.downcase, offset)
+    p1 = p0 + q.length
+
+    hits.push(
+      p0: p0,
+      p1: p1,
+      snippet: snippet(e, p0, p1)
+    )
+
+    find_hits(e, q, p1, hits) if e.text.downcase.index(q.downcase, p1)
+
+    hits
+  end
+
   def chapters_from_db(q)
     db_results = []
     stm = @db.prepare "SELECT href, basecfi, chapter_id from chapters where chapters MATCH ?"
@@ -68,12 +81,16 @@ def cfis_from_epub(db_results, q)
       els.each do |e|
         # calculate the cfi of the dom element
         cfi = walk_up_dom(e, "", 0)
+        # find all the hits in this element
+        hits = find_hits(e, q, 0, [])
 
-        results[:search_results].push(
-          cfi: "#{r[:basecfi]}#{cfi}",
-          chapter_id: r[:chapter_id],
-          snippet: snippet(e, q)
-        )
+        hits.each do |hit|
+          results[:search_results].push(
+            cfi: "#{r[:basecfi]}#{cfi},/1:#{hit[:p0]},/1:#{hit[:p1]}",
+            chapter_id: r[:chapter_id],
+            snippet: hit[:snippet]
+          )
+        end
       end
     end
     results

spec/controllers/e_pubs_controller_spec.rb

@@ -154,8 +154,8 @@
       it do
         expect(response).to have_http_status(:success)
         expect(JSON.parse(response.body)["q"]).to eq "White Whale"
-        expect(JSON.parse(response.body)["search_results"].length).to eq 91
-        expect(JSON.parse(response.body)["search_results"][0]["cfi"]).to eq "/6/84[xchapter_036]!/4/2/42"
+        expect(JSON.parse(response.body)["search_results"].length).to eq 107
+        expect(JSON.parse(response.body)["search_results"][0]["cfi"]).to eq "/6/84[xchapter_036]!/4/2/42,/1:66,/1:77"
         expect(JSON.parse(response.body)["search_results"][0]["snippet"]).to eq "... heard me give orders about a white whale. Look ye! d’ye see this Spanis..."
       end
     end
@@ -165,7 +165,7 @@
 
       it do
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)["search_results"].length).to eq 2
+        expect(JSON.parse(response.body)["search_results"].length).to eq 3
       end
     end
   end