Merge pull request #172 from oduwsdl/pandora-urir-fix

Pandora urir fix, closes #171
oduwsdl · Feb 22, 2021 · 71de655 · 71de655
2 parents a836ea3 + c2242fa
commit 71de655
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.2021.02.01.205105'
+release = '0.2021.02.22.022825'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/mementoembed/mementoresource.py b/mementoembed/mementoresource.py
@@ -124,6 +124,14 @@ def get_original_uri_from_response(response):
         # urir = aiu.convert_LinkTimeMap_to_dict(
         #     response.headers['link'] )['original_uri']
         urir = response.links['original']['url']
+
+        if 'pandora.nla.gov.au/pan/' in urir:
+            # TODO: make regex
+            module_logger.info("discovered URI-R {} with hostname pandora.nla.gov, fixing...".format(urir))
+            urir = re.sub(r'http[s]?://pandora.nla.gov.au/pan/[0-9]*/[0-9]*-[0-9]*/(.*)', r'\1', urir)
+            if urir[0:4] != 'http':
+                urir = "http://{}".format(urir)
+
     except KeyError as e:
         raise NotAMementoError(
             "link header could not be parsed for original URI",

diff --git a/mementoembed/version.py b/mementoembed/version.py
@@ -1,3 +1,3 @@
 __appname__ = "MementoEmbed"
-__appversion__ = '0.2021.02.01.205105'
+__appversion__ = '0.2021.02.22.022825'
 __useragent__ = "{}/{}".format(__appname__, __appversion__)