Merge branch 'master' of https://github.com/SmartDataAnalytics/OpenResearch

Author: WolfgangFahl

migration/openresearch/eventcorpus.py

@@ -16,7 +16,7 @@ def __init__(self,debug=False):
         '''
         self.debug=debug
 
-    def fromWikiSonBackupFiles(self,backupDir=str(Path.home() / 'wikibackup'/ 'orcp' ),wikiId='orcp',listOfItems=[]):
+    def fromWikiSonBackupFiles(self,backupDir=str(Path.home() / 'wikibackup'/ 'or' ),wikiId='or',listOfItems=[]):
         '''
                get events with series by knitting / linking the entities together
         '''

migration/tests/testIssue236.py

@@ -45,10 +45,10 @@ def testFromBackupFile(self):
         eventSeriesList.fromWikiSonBackupFiles('Event series',wikiId=self.wikiId)
         self.assertGreater(len(eventSeriesList.getList()), 100)
         eventList= EventList()
-        eventList.fromWikiSonBackupFiles('Event',wikiId='orcp')
+        eventList.fromWikiSonBackupFiles('Event',wikiId='or')
         self.assertGreater(len(eventList.getList()),8000)
         eventList2= EventList()
-        eventList2.fromWikiSonBackupFiles('Event',wikiId='orcp',listOfItems=['3DUI 2020','3DUI 2016'])
+        eventList2.fromWikiSonBackupFiles('Event',wikiId='or',listOfItems=['3DUI 2020','3DUI 2016'])
         self.assertGreaterEqual(len(eventList2.getList()), 2)
 
     def testUpdateEntity(self):