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

Jump to bottom

#221: strip xml/html from data to POST to Aeon #225

Merged
merged 1 commit into from
Aug 27, 2022
Merged

#221: strip xml/html from data to POST to Aeon #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions process_request/routines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import re
import xml.etree.ElementTree as ET

from asnake.aspace import ASpace
from django.conf import settings
from django.core.mail import send_mail
Expand All @@ -14,6 +17,16 @@ class Processor(object):
delivery formats.
"""

def strip_tags(self, user_string):
"""Strips XML and HTML tags from a string."""
try:
xmldoc = ET.fromstring(f'<xml>{user_string}</xml>')
textcontent = ''.join(xmldoc.itertext())
except ET.ParseError:
tagregxp = re.compile(r'<[/\w][^>]+>')
textcontent = tagregxp.sub('', user_string)
return textcontent

def get_data(self, uri_list, dimes_baseurl):
"""Gets data about an archival object from ArchivesSpace.

Expand Down Expand Up @@ -42,19 +55,19 @@ def get_data(self, uri_list, dimes_baseurl):
if objects.status_code == 200:
for item_json in objects.json():
item_collection = item_json.get("ancestors")[-1].get("_resolved")
parent = get_parent_title(item_json.get("ancestors")[0].get("_resolved")) if len(item_json.get("ancestors")) > 1 else None
parent = self.strip_tags(get_parent_title(item_json.get("ancestors")[0].get("_resolved"))) if len(item_json.get("ancestors")) > 1 else None
format, container, subcontainer, location, barcode, container_uri = get_preferred_format(item_json)
restrictions, restrictions_text = get_rights_info(item_json, aspace.client)
data.append({
"creators": get_resource_creators(item_collection, aspace.client),
"restrictions": restrictions,
"restrictions_text": restrictions_text,
"restrictions_text": self.strip_tags(restrictions_text),
"restricted_in_container": get_restricted_in_container(container_uri, aspace.client) if (settings.RESTRICTED_IN_CONTAINER and container_uri and format not in ["digital", "microform"]) else "",
"collection_name": item_collection.get("title"),
"collection_name": self.strip_tags(item_collection.get("title")),
"parent": parent,
"dates": get_dates(item_json, aspace.client),
"resource_id": item_collection.get("id_0"),
"title": item_json.get("display_string"),
"title": self.strip_tags(item_json.get("display_string")),
"uri": item_json["uri"],
"dimes_url": get_url(item_json, dimes_baseurl, aspace.client),
"containers": get_container_indicators(item_json),
Expand Down