Skip to content

Commit

Permalink
Merge pull request #56 from Capitains/missing_text
Browse files Browse the repository at this point in the history
Missing text
  • Loading branch information
sonofmun authored May 15, 2017
2 parents fe2002c + 4ae2a13 commit 2a31b69
Show file tree
Hide file tree
Showing 8 changed files with 60,803 additions and 2 deletions.
7 changes: 6 additions & 1 deletion capitains_nautilus/cts/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,12 @@ def __getText__(self, urn):
except Exception as E:
raise E

resource = self.read(identifier=urn, path=text.path)

if os.path.isfile(text.path):
resource = self.read(identifier=urn, path=text.path)
else:
resource = None
raise UnknownCollection("File matching %s does not exist" % text.path)

return resource, text

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='capitains_nautilus',
version="1.0.0",
version="1.0.1",
description='Resolver for Capitains Guidelines Repository',
url='http://github.com/Capitains/nautilus',
author='Thibault Clerice',
Expand Down
6 changes: 6 additions & 0 deletions tests/cts/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ def test_text_resource(self):
"It should be possible to retrieve text"
)

def test_missing_text_resource(self):
""" Test to make sure an UnknownCollection error is raised when a text is missing """
Repository = NautilusCTSResolver(["./tests/test_data/missing_text"])
with self.assertRaises(UnknownCollection):
text, metadata = Repository.__getText__("urn:cts:farsiLit:hafez.divan.missing_text")

def test_get_capabilities(self):
""" Check Get Capabilities """
Repository = NautilusCTSResolver(
Expand Down
3 changes: 3 additions & 0 deletions tests/test_data/missing_text/data/hafez/__cts__.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<ti:textgroup xmlns:ti="http://chs.harvard.edu/xmlns/cts" projid="farsiLit:hafez" urn="urn:cts:farsiLit:hafez">
<ti:groupname xml:lang="eng">Hafez</ti:groupname>
</ti:textgroup>
29 changes: 29 additions & 0 deletions tests/test_data/missing_text/data/hafez/divan/__cts__.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<ti:work xmlns:ti="http://chs.harvard.edu/xmlns/cts" groupUrn="urn:cts:farsiLit:hafez" projid="farsiLit:divan" urn="urn:cts:farsiLit:hafez.divan" xml:lang="fa">
<ti:title xml:lang="eng">Div&#257;n</ti:title>
<ti:edition urn="urn:cts:farsiLit:hafez.divan.perseus-far1" workUrn="urn:cts:farsiLit:hafez.divan">
<ti:label xml:lang="eng">Div&#257;n</ti:label>
<ti:description xml:lang="eng">Perseus:bib:oclc, 254557372. Diwan-i Hwaga Sams-ad-Din
Muhammad Hafiz Sirazi qaddas sarra-yi al-aziz ba tamam. edited by Muhammad
Qazwini and Qasim Gani as available on ganjoor.net. Tehran, Caphana-i Maglis.
1941. </ti:description>
</ti:edition>
<ti:translation xml:lang="eng" urn="urn:cts:farsiLit:hafez.divan.perseus-eng1" workUrn="urn:cts:farsiLit:hafez.divan">
<ti:label xml:lang="eng">Div&#257;n (English)</ti:label>
<ti:description xml:lang="eng">Perseus:bib:oclc, 559481156. The D&#299;v&#257;n .Translated for
the first time out of the Persian into English prose, with critical and
explanatory remarks, with an introductory preface, with a note on &#7778;&#363;f&#299;ism, and
with a life of the author, by H. Wilberforce Clarke. Calcutta, India. 1891. </ti:description>
</ti:translation>
<ti:translation xml:lang="ger" urn="urn:cts:farsiLit:hafez.divan.perseus-ger1" workUrn="urn:cts:farsiLit:hafez.divan">
<ti:label xml:lang="eng">Div&#257;n (German)</ti:label>
<ti:description xml:lang="eng">Perseus:bib:oclc, 6773200. Mohammed Schemsed-din Hafis,
Der Diwan, Aus dem Persischen zum erstenmal ganz &#252;bersetzt von Joseph von
Hammer-Purgstall. Stuttgart and T&#252;bingen, 1812. </ti:description>
</ti:translation>
<ti:translation xml:lang="ger" urn="urn:cts:farsiLit:hafez.divan.missing_text" workUrn="urn:cts:farsiLit:hafez.divan">
<ti:label xml:lang="eng">Div&#257;n (German)</ti:label>
<ti:description xml:lang="eng">Perseus:bib:oclc, 6773200. Mohammed Schemsed-din Hafis,
Der Diwan, Aus dem Persischen zum erstenmal ganz &#252;bersetzt von Joseph von
Hammer-Purgstall. Stuttgart and T&#252;bingen, 1812. </ti:description>
</ti:translation>
</ti:work>
19,634 changes: 19,634 additions & 0 deletions tests/test_data/missing_text/data/hafez/divan/hafez.divan.perseus-eng1.xml

Large diffs are not rendered by default.

17,894 changes: 17,894 additions & 0 deletions tests/test_data/missing_text/data/hafez/divan/hafez.divan.perseus-far1.xml

Large diffs are not rendered by default.

23,230 changes: 23,230 additions & 0 deletions tests/test_data/missing_text/data/hafez/divan/hafez.divan.perseus-ger1.xml

Large diffs are not rendered by default.

0 comments on commit 2a31b69

Please sign in to comment.