Merge pull request #794 from Gluejar/update-ubiquity

Update ubiquity

bookdata/sitemaps.txt

@@ -6,4 +6,12 @@ https://oa.psupress.org/sitemap.xml
 https://www.larcommons.net/sitemap.xml
 https://www.uwestminsterpress.co.uk/sitemap.xml
 https://www.stockholmuniversitypress.se/sitemap.xml
-https://www.luminosoa.org/sitemap.xml
+https://www.luminosoa.org/sitemap.xml
+https://iitikship.iiti.ac.in/sitemap.xml
+https://aperio.press/sitemap.xml
+https://press.lse.ac.uk/sitemap.xml
+https://press.sjms.nu/sitemap.xml
+https://trystingtree.library.oregonstate.edu/sitemap.xml
+https://publishing.vt.edu/sitemap.xml
+https://universitypress.whiterose.ac.uk/sitemap.xml
+https://www.winchesteruniversitypress.org/sitemap.xml

core/bookloader.py

@@ -909,10 +909,9 @@ class BasePandataLoader(object):
                     if work and id.work and id.work_id is not work.id:
                         # dangerous! merge newer into older
                         if work.id < id.work_id:
-                            merge_works(work, id.work)
+                            work = merge_works(work, id.work)
                         else:
-                            merge_works(id.work, work)
-                            work = id.work
+                            work = merge_works(id.work, work)
                     else:
                         work = id.work
                     if id.edition and not edition:

core/loaders/ubiquity.py

@@ -8,7 +8,9 @@ from . import BaseScraper
 HAS_EDS = re.compile(r'\(eds?\.\)')
 UBIQUITY_HOSTS = ["ubiquitypress.com", "kriterium.se", "oa.finlit.fi", "humanities-map.net",
     "oa.psupress.org", "larcommons.net", "uwestminsterpress.co.uk", "stockholmuniversitypress.se",
-    "luminosoa.org",
+    "luminosoa.org", "iitikship.iiti.ac.in", "aperio.press", "press.lse.ac.uk", "press.sjms.nu", 
+    "trystingtree.library.oregonstate.edu", "publishing.vt.edu", "universitypress.whiterose.ac.uk",
+    "www.winchesteruniversitypress.org",
 ]
 
 class UbiquityScraper(BaseScraper):