Bugfixes

2 files changed, 11 insertions, 2 deletions

diff --git a/article_epub/publishers/nih.py b/article_epub/publishers/nih.py
index 7e0df3f..817ea41 100644
--- a/article_epub/publishers/nih.py
+++ b/article_epub/publishers/nih.py
@@ -29,7 +29,7 @@ class NIH(Publisher):
         self.get_citation()
         print('done')
 
-    def epubify(self):
+    def epubify(self,output=None):
 
         all_authors = ''
         for i in range(0,len(self.author_surnames)):
@@ -38,7 +38,11 @@ class NIH(Publisher):
             if(i != (len(self.author_surnames) - 1)):
                 all_authors += ', '
 
-        self.output = self.author_surnames[0]+'_'+self.year+'.epub'
+        if output == None:
+            self.output = self.author_surnames[0]+'_'+self.year+'.epub'
+        else:
+            self.output = output
+         
         output_raw = '/tmp/raw.epub'
         
         pdf_link = self.soup.find('div',class_='format-menu') \
diff --git a/article_epub/publishers/oxford.py b/article_epub/publishers/oxford.py
index aa0a431..b6a5f16 100644
--- a/article_epub/publishers/oxford.py
+++ b/article_epub/publishers/oxford.py
@@ -11,6 +11,11 @@ class Oxford(Publisher):
     def check_fulltext(self):
         if self.soup.find('div',{'data-widgetname':'ArticleFulltext'}) == None:
             sys.exit('Error: Can\'t access fulltext of article')
+        elif self.soup.find('span',{'id':'UserHasAccess'}) \
+                ['data-userhasaccess'] == 'False':        
+            sys.exit('Error: Can\'t access fulltext of article')
+        elif self.soup.find('div',class_='PdfOnlyLink') != None:
+            sys.exit('Error: Can\'t access fulltext of article')
         else:
             return(True)