Merge remote-tracking branch 'refs/remotes/origin/master'

Author: tholzheim

migration/openresearch/event.py

@@ -81,8 +81,7 @@ def getAskQuery(self,askExtra="",propertyLookupList=None):
             str: the SMW ask query
         '''
         entityName=self.getEntityName()
-        isASelector="IsA::%s" % entityName
-        selector="Category:Event series" if entityName=="EventSeries" else isASelector
+        selector="IsA::%s" % entityName
         ask="""{{#ask:[[%s]]%s
 |mainlabel=pageTitle
 |?_CDAT=creationDate
@@ -183,9 +182,15 @@ def fromLoD(self,lod):
         return errors
 
     def getRatedLod(self,ratingCallback=None):
+        '''
+        get the list of dicts with a potential rating
+        
+        Args:
+            ratingCallback(func): a function to be called for rating of this entity
+        '''
         lod=[]
         for entity in self.getList():
-            eventRecord={}
+            eventRecord={'pageTitle':entity.pageTitle}
             for propertyLookup in self.propertyLookupList:
                 name=propertyLookup['name']
                 if hasattr(entity,name):
@@ -203,11 +208,11 @@ def __init__(self):
         self.eventSeries=[]
         super(EventSeriesList, self).__init__("eventSeries",EventSeries)
         self.propertyLookupList=[
-            { 'prop':'Acronym',    'name': 'acronym'},
+            { 'prop':'EventSeries acronym', 'name': 'acronym'},
             { 'prop':'Homepage',   'name': 'homepage'},
             { 'prop':'Title',      'name': 'title'},
             #{ 'prop':'Field',      'name': 'subject'},
-            { 'prop':'WikiDataId',  'name': 'wikiDataId'},
+            { 'prop':'Wikidataid',  'name': 'wikiDataId'},
             { 'prop':'DblpSeries',  'name': 'dblpSeries' }
         ]
 

migration/ormigrate/issue166.py

@@ -10,6 +10,7 @@
 from wikibot.wikipush import WikiPush
 import re
 from lodstorage.sql import SQLDB
+from os.path import expanduser
 
 class WikiCFPIDFixer(PageFixer):
     '''
@@ -24,7 +25,9 @@ def __init__(self, wikiId="or", baseUrl="https://www.openresearch.org/wiki/", de
         # call super constructor
         super(WikiCFPIDFixer, self).__init__(wikiId, baseUrl)
         self.debug = debug
-        self.sqlDB = SQLDB(dbname=hf.getResourcePath()+'Event_all.db')
+        home = expanduser("~")
+        dbname="%s/.ptp/Event_all.db" % home
+        self.sqlDB = SQLDB(dbname=dbname)
 
 
     def getPageWithWikicfpid(self,page,event):

migration/ormigrate/issue170.py

@@ -0,0 +1,14 @@
+'''
+Created on 2021-04-15
+
+@author: wf
+'''
+from ormigrate.fixer import PageFixer
+
+class CurationQualityFixer(PageFixer):
+    '''
+    https://github.com/SmartDataAnalytics/OpenResearch/issues/170
+        
+    Curation quality check
+    '''
+        

migration/setup.py

@@ -12,7 +12,7 @@
     long_description = open('../README.md').read()
 
 setup(name='OpenResearchMigration',
-      version='0.0.11',
+      version='0.0.12',
       description='python api to access OPENRESEARCH data',
       long_description=long_description,
       long_description_content_type='text/markdown',

migration/tests/testIssue168.py

@@ -7,8 +7,7 @@
 from ormigrate.toolbox import HelperFunctions as hf
 from openresearch.event import Event,EventList,EventSeriesList
 from collections import Counter
-from wikibot.wikiuser import WikiUser
-from pandas.tests.groupby.test_index_as_string import series
+
 
 class TestIssue168(unittest.TestCase):
     '''
@@ -23,13 +22,24 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def getEventsWithSeries(self,wikiUser):
+    def getEventsWithSeries(self,wikiUser,debug=False):
+        '''
+        get events with series by knitting / linking the entities together
+        '''
         eventList=EventList()
+        eventList.debug=debug
         eventList.fromCache(wikiUser)
+        
+        
         eventSeriesList=EventSeriesList()
+        eventSeriesList.debug=debug
         eventSeriesList.fromCache(wikiUser)
+        
+        # get foreign key hashtable
         seriesLookup=eventList.getLookup("inEventSeries", withDuplicates=True)
+        # get "primary" key hashtable
         seriesAcronymLookup=eventSeriesList.getLookup("acronym",withDuplicates=True)
+        
         for seriesAcronym in seriesLookup.keys():
             if seriesAcronym in seriesAcronymLookup:
                 seriesEvents=seriesLookup[seriesAcronym]
@@ -43,7 +53,7 @@ def getEventsWithSeries(self,wikiUser):
 
     def testEventsWithSeries(self):
         wikiUser=hf.getSMW_WikiUser(save=hf.inPublicCI())
-        eventList,eventSeriesList=self.getEventsWithSeries(wikiUser)
+        eventList,eventSeriesList=self.getEventsWithSeries(wikiUser,debug=True)
 
     def testRatingCallback(self):
         '''

migration/tests/testIssue170.py

@@ -0,0 +1,30 @@
+'''
+Created on 2021-04-15
+
+@author: wf
+'''
+import unittest
+
+class TestIssue170(unittest.TestCase):
+
+
+    def setUp(self):
+        pass
+
+
+    def tearDown(self):
+        pass
+
+
+    def testCurationQualityCheck170(self):
+        '''
+        https://github.com/SmartDataAnalytics/OpenResearch/issues/170
+        
+        Curation quality check
+        '''
+        
+
+
+if __name__ == "__main__":
+    #import sys;sys.argv = ['', 'Test.testName']
+    unittest.main()