Refactored names of methods and variables

Author: tholzheim

migration/requirements.txt

@@ -11,4 +11,4 @@ wikirender>=0.0.23
 # https://github.com/somnathrakshit/geograpy3
 geograpy3>=0.1.29
 # https://github.com/SmartDataAnalytics/OpenResearch
-ConferenceCorpus>=0.0.4
+ConferenceCorpus>=0.0.7

migration/tests/corpusfortesting.py

@@ -3,15 +3,14 @@
 
 @author: wf
 '''
-from corpus.eventcorpus import EventDataSource
 from corpus.lookup import CorpusLookup
-from datasources.openresearch import OREventCorpus, OREventManager
 from lodstorage.storageconfig import StorageConfig
-
 from ormigrate.toolbox import HelperFunctions as hf
 from wikifile.wikiFileManager import WikiFileManager
 from os import path
 import os
+
+
 class CorpusForTesting(object):
     '''
     Simplify initializing an EventCorpus for tests (singleton)
@@ -48,7 +47,7 @@ def getWikiFileManager(cls,wikiId=None,debug=False):
         return wikiFileManager
 
     @classmethod
-    def getEventCorpusFromWikiAPI(cls, lookupId:str="orclone", forceUpdate:bool=False, debug:bool=False):
+    def getEventDataSourceFromWikiAPI(cls, lookupId:str= "orclone", forceUpdate:bool=False, debug:bool=False):
         '''
         get events with series by knitting / linking the entities together
 
@@ -64,7 +63,7 @@ def getEventCorpusFromWikiAPI(cls, lookupId:str="orclone", forceUpdate:bool=Fals
         return eventDataSource
 
     @classmethod
-    def getEventCorpusFromWikiText(cls, lookupId:str="orclone-backup", forceUpdate:bool=False, debug=False):
+    def getEventDataSourceFromWikiText(cls, lookupId:str= "orclone-backup", forceUpdate:bool=False, debug=False):
         """
         get events with series by knitting/linking entities from a WikiFileManager
 

migration/tests/testIssue168_ratingCallBack.py

@@ -66,7 +66,7 @@ def testPageRatingList(self):
     #    test the rating call back
     #    '''
     #    profile=Profiler("test rating call back")
-    #    eventCorpus=Corpus.getEventCorpusFromWikiAPI(debug=self.debug)
+    #    eventCorpus=Corpus.getEventDataSourceFromWikiAPI(debug=self.debug)
     #    lod,errors=eventCorpus.eventList.getRatedLod(Event.rateMigration)
     #    self.checkRatedLod(lod, errors)
     #    lod,errors=eventCorpus.eventSeriesList.getRatedLod(EventSeries.rateMigration)

migration/tests/testIssue170_Curation.py

@@ -47,8 +47,8 @@ def testCurationQualityCheck170(self):
 
     def testUserCount(self):
         # only needed to setup userrating yaml file
-        eventCorpus=Corpus.getEventCorpusFromWikiAPI(debug=self.debug, force=True)
-        userLookup=eventCorpus.eventManager.getLookup("lastEditor",withDuplicates=True)
+        eventDataSource=Corpus.getEventDataSourceFromWikiAPI(debug=self.debug, force=True)
+        userLookup=eventDataSource.eventManager.getLookup("lastEditor",withDuplicates=True)
         if self.debug:
             print (f"{len(userLookup)} users")
         expected=1 if hf.inPublicCI() else 140

migration/tests/test_EventCorpus.py

@@ -52,8 +52,8 @@ class TestEventCorpus(unittest.TestCase):
     def setUp(self):
         self.debug = False
         self.profile=True
-        self.eventCorpusAPI=None
-        self.eventCorpusWikiText=None
+        self.eventDataSourceAPI=None
+        self.eventDataSourceWikiText=None
         pass
 
     def tearDown(self):
@@ -85,9 +85,9 @@ def testEventCorpusFromWikiUser(self):
         '''
         self.debug=True
         profile=Profiler("getting EventCorpus from WikiUser")
-        eventCorpus=Corpus.getEventCorpusFromWikiAPI(forceUpdate=True, debug=self.debug)
+        eventDataSource=Corpus.getEventDataSourceFromWikiAPI(forceUpdate=True, debug=self.debug)
         profile.time()
-        self.checkEventCorpus(eventCorpus)
+        self.checkEventCorpus(eventDataSource)
 
 
     def testEventCorpusFromWikiUserCache(self):
@@ -97,19 +97,19 @@ def testEventCorpusFromWikiUserCache(self):
         debug = True
         if Corpus.hasCache():
             profile=Profiler(f"getting EventCorpus for {Corpus.wikiId} from WikiUser Cache",self.profile)
-            self.eventCorpusAPI=Corpus.getEventCorpusFromWikiAPI(debug=debug, forceUpdate=False)
+            self.eventDataSourceAPI=Corpus.getEventDataSourceFromWikiAPI(debug=debug, forceUpdate=False)
             profile.time()
-            self.checkEventCorpus(self.eventCorpusAPI)
+            self.checkEventCorpus(self.eventDataSourceAPI)
 
 
     def testEventCorpusFromWikiFileManager(self):
         """
         test the Event Corpus from the wiki file manager(wikiFiles).
         """
         profile=Profiler(f"getting EventCorpus from wikiText files for {Corpus.wikiId}")
-        self.eventCorpusWikiText = Corpus.getEventCorpusFromWikiText(forceUpdate=True, debug=self.debug)
+        self.eventDataSourceWikiText = Corpus.getEventDataSourceFromWikiText(forceUpdate=True, debug=self.debug)
         profile.time()
-        self.checkEventCorpus(self.eventCorpusWikiText,['pageTitle'])
+        self.checkEventCorpus(self.eventDataSourceWikiText, ['pageTitle'])
 
 
     def testMatchingSetsForEventCorpus(self):
@@ -119,15 +119,15 @@ def testMatchingSetsForEventCorpus(self):
         if not Corpus.hasCache():
             return
         profile=Profiler(f"getting EventCorpora from wikiAPI and wikiText files for {Corpus.wikiId}")
-        if self.eventCorpusAPI is None:
-            self.eventCorpusAPI=Corpus.getEventCorpusFromWikiAPI(debug=self.debug, forceUpdate=False)
-        if self.eventCorpusWikiText is None:
-            self.eventCorpusWikiText = Corpus.getEventCorpusFromWikiText(debug=self.debug)
+        if self.eventDataSourceAPI is None:
+            self.eventDataSourceAPI=Corpus.getEventDataSourceFromWikiAPI(debug=self.debug, forceUpdate=False)
+        if self.eventDataSourceWikiText is None:
+            self.eventDataSourceWikiText = Corpus.getEventDataSourceFromWikiText(debug=self.debug)
         profile.time()    
         profile=Profiler(f"finding common events and series for {Corpus.wikiId}")
         keys=["acronym","pageTitle"]
-        eventSet=MatchingSet("Events","api",self.eventCorpusAPI.eventManager,"wikiText",self.eventCorpusWikiText.eventManager,keys)
-        eventSeriesSet=MatchingSet("EventSeries","api",self.eventCorpusAPI.eventSeriesManager,"wikiText",self.eventCorpusWikiText.eventSeriesManager,keys)
+        eventSet=MatchingSet("Events","api", self.eventDataSourceAPI.eventManager, "wikiText", self.eventDataSourceWikiText.eventManager, keys)
+        eventSeriesSet=MatchingSet("EventSeries","api", self.eventDataSourceAPI.eventSeriesManager, "wikiText", self.eventDataSourceWikiText.eventSeriesManager, keys)
         profile.time()
         eventSet.showStats()
         eventSeriesSet.showStats()

migration/tests/test_EventLocationContext.py

@@ -17,7 +17,7 @@ def setUp(self) -> None:
         targetWikiTextPath = f"{home}/.or/generated/Location"
         self.wikiFileManager = CorpusForTesting.getWikiFileManager()
         self.wikiFileManager.targetPath=targetWikiTextPath
-        self.eventCorpus=CorpusForTesting.getEventCorpusFromWikiText()
+        self.eventDataSource=CorpusForTesting.getEventDataSourceFromWikiText()
         self.eventLocationContext=EventLocationHandler(wikiFileManager=self.wikiFileManager)
 
     def test_generateLocationPages(self):
@@ -37,7 +37,7 @@ def test_generateORLocationPages(self):
         Note: Not running in CI since it generates a lot of pages and uses functionalities which are test in the other tests
         """
         profile = Profiler("Generate OPENRESEARCH location pages (Limited to 100 events)", self.profile)
-        self.eventLocationContext.generateORLocationPages(self.eventCorpus.eventManager.events[:100], overwrite=True)
+        self.eventLocationContext.generateORLocationPages(self.eventDataSource.eventManager.events[:100], overwrite=True)
         profile.time()
         # ToDo: test if generated correctly