Skip to content

Address Issue-149. #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Address Issue-149. #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2753cf
Refactor for doc.
markpbaggett Oct 16, 2025
ca20386
Split more safely.
markpbaggett Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions iiify/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
import requests
from .resolver import ARCHIVE, URI_PRIFIX
from bs4 import BeautifulSoup
import json

def buildSearchURL(identifier, query):
def build_search_url(identifier, query):
response = requests.get(f"{ARCHIVE}/metadata/{identifier}")
response.raise_for_status()

response.raise_for_status()
metadata = response.json()

return f"https://{metadata['server']}/fulltext/inside.php?item_id={identifier}&doc={identifier}&path={metadata['dir']}&q={query}"
doc = [file['name'].split('_djvu.xml')[0] for file in metadata["files"] if '_djvu.xml' in file['name']][0]
return f"https://{metadata['server']}/fulltext/inside.php?item_id={identifier}&doc={doc}&path={metadata['dir']}&q={query}"

def iiif_search(identifier, query):
url = buildSearchURL(identifier, query)

# print (f"Search URL:\n{url}")
url = build_search_url(identifier, query)
response = requests.get(url)
response.raise_for_status()
ia_response = response.json()
# print (json.dumps(ia_response, indent=4))

searchResponse = {
"@context":"http://iiif.io/api/presentation/2/context.json",
"@id": f"{URI_PRIFIX}/search/{identifier}?q={query}",
"@type":"sc:AnnotationList",
"@type": "sc:AnnotationList",

"resources": [
]
Expand Down Expand Up @@ -51,8 +46,7 @@ def iiif_search(identifier, query):

for box in paragraph['boxes']:
x = int(box['l'])
y = int (box['t'])
right = 0
y = int(box['t'])
# If r is missing then use the paragraph
if 'r' in box:
right = int(box['r'])
Expand All @@ -61,7 +55,7 @@ def iiif_search(identifier, query):

width = right - x
height = int(box['b']) - y
page = int(paragraph['page']) - 1
page = int(paragraph['page']) - 1
if "leaf0_missing" in ia_response and ia_response['leaf0_missing'] == False:
page = int(paragraph['page'])

Expand All @@ -82,4 +76,4 @@ def iiif_search(identifier, query):
matchNo += 1
count += 1

return searchResponse
return searchResponse
2 changes: 1 addition & 1 deletion tests/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def mock_response(url, *args, **kwargs):

metadataPatch.side_effect = mock_response

self.assertEqual(search.buildSearchURL("journalofexpedit00ford", "query"), "https://ia601302.us.archive.org/fulltext/inside.php?item_id=journalofexpedit00ford&doc=journalofexpedit00ford&path=/31/items/journalofexpedit00ford&q=query", "Unexpected search query")
self.assertEqual(search.build_search_url("journalofexpedit00ford", "query"), "https://ia601302.us.archive.org/fulltext/inside.php?item_id=journalofexpedit00ford&doc=journalofexpedit00ford&path=/31/items/journalofexpedit00ford&q=query", "Unexpected search query")

@patch("requests.get")
def multi_box(self, searchPatch):
Expand Down