Skip to content
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

Escape xml in delete() using ElementTree #358

Merged
merged 2 commits into from
Jan 23, 2021
Merged

Escape xml in delete() using ElementTree #358

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
7bfe7a2
Escape special characters in the XML generated in the delete() method
ramayer Jan 22, 2021
b48eabd
use ElementTree to correctly escape XML for delete()
ramayer Jan 22, 2021
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
11 changes: 9 additions & 2 deletions pysolr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,11 +1119,18 @@ def delete(
else:
doc_id = list(filter(None, id))
if doc_id:
m = "<delete>%s</delete>" % "".join("<id>%s</id>" % i for i in doc_id)
et = ElementTree.Element("delete")
for one_doc_id in doc_id:
subelem = ElementTree.SubElement(et, 'id')
subelem.text = one_doc_id
m = ElementTree.tostring(et)
else:
raise ValueError("The list of documents to delete was empty.")
elif q is not None:
m = "<delete><query>%s</query></delete>" % q
et = ElementTree.Element("delete")
subelem = ElementTree.SubElement(et, 'query')
subelem.text = q
m = ElementTree.tostring(et)

return self._update(
m,
Expand Down
8 changes: 8 additions & 0 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,14 @@ def test_delete(self):
self.assertEqual(len(self.solr.search("type_s:grandchild")), 1)
self.solr.delete(q="price:[0 TO 15]")
self.solr.delete(q="type_s:parent", commit=True)

# Test a query that would need to be quoted when using the XML API.
# Ids with a "<" character will give an error using v3.9.0 or earlier
self.solr.delete(id='cats<dogs')
# These will delete too much when using v3.9.0 or earlier.
self.solr.delete(q='id:*</query><query> id:999 AND id:9999')
self.solr.delete(id='doc_4</id><id>doc_3', commit=True)

# one simple doc should remain
# parent documents were also deleted but children remain as orphans
self.assertEqual(len(self.solr.search("doc")), 1)
Expand Down