Skip to content

Commit

Permalink
Fix extraction in Solr >= 8.
Browse files Browse the repository at this point in the history
  • Loading branch information
andresmrm authored Nov 2, 2024
1 parent 65442a6 commit df20c99
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions pysolr.py
Original file line number Diff line number Diff line change
Expand Up @@ -1284,10 +1284,21 @@ def extract(self, file_obj, extractOnly=True, handler="update/extract", **kwargs
self.log.exception("Failed to load JSON response")
raise

data["contents"] = data.pop(filename, None)
if "file" in data:
# For Solr >= 8.
data["contents"] = data.pop("file", None)
else:
# For Solr <= 7.
data["contents"] = data.pop(filename, None)

data["metadata"] = metadata = {}

raw_metadata = data.pop("%s_metadata" % filename, None)
if "file_metadata" in data:
# For Solr >= 8.
raw_metadata = data.pop("file_metadata", None)
else:
# For Solr <= 7.
raw_metadata = data.pop("%s_metadata" % filename, None)

if raw_metadata:
# The raw format is somewhat annoying: it's a flat list of
Expand Down

0 comments on commit df20c99

Please sign in to comment.