#609 initializedb script fix

OnroerendErfgoed · Oct 5, 2020 · e57a5f7 · e57a5f7
1 parent 2d1f564
commit e57a5f7
Showing 1 changed file with 102 additions and 110 deletions.
diff --git a/atramhasis/scripts/initializedb.py b/atramhasis/scripts/initializedb.py
@@ -1,17 +1,14 @@
 import os
 import sys
 
-from skosprovider_sqlalchemy.models import ConceptScheme, Label
+from pyramid.paster import get_appsettings
+from pyramid.paster import setup_logging
+from pyramid.scripts.common import parse_vars
+from skosprovider_sqlalchemy.models import ConceptScheme
+from skosprovider_sqlalchemy.models import Label
 from skosprovider_sqlalchemy.utils import import_provider
-from sqlalchemy.orm import sessionmaker
-import transaction
 from sqlalchemy import engine_from_config
-from pyramid.paster import (
-    get_appsettings,
-    setup_logging,
-)
-from pyramid.scripts.common import parse_vars
-from zope.sqlalchemy import ZopeTransactionExtension
+from sqlalchemy.orm import sessionmaker
 
 
 def usage(argv):
@@ -36,108 +33,103 @@ def main(argv=sys.argv):
     setup_logging(config_uri)
     settings = get_appsettings(config_uri, options=options)
     engine = engine_from_config(settings, 'sqlalchemy.')
-    session_maker = sessionmaker(
-        bind=engine,
-        extension=ZopeTransactionExtension()
+    db_session = sessionmaker(bind=engine)()
+    import_provider(
+        trees,
+        ConceptScheme(
+            id=1,
+            uri='urn:x-skosprovider:trees',
+            labels=[
+                Label('Verschillende soorten bomen', u'prefLabel', u'nl'),
+                Label('Different types of trees', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        geo,
+        ConceptScheme(
+            id=2,
+            uri='urn:x-skosprovider:geo',
+            labels=[
+                Label('Geografie', u'prefLabel', u'nl'),
+                Label('Geography', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        styles_and_cultures,
+        ConceptScheme(
+            id=3,
+            uri='https://id.erfgoed.net/thesauri/stijlen_en_culturen',
+            labels=[
+                Label('Stijlen en Culturen', u'prefLabel', u'nl'),
+                Label('Styles and Cultures', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        materials,
+        ConceptScheme(
+            id=4,
+            uri='https://id.erfgoed.net/thesauri/materialen',
+            labels=[
+                Label('Materialen', u'prefLabel', u'nl'),
+                Label('Materials', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        eventtypes,
+        ConceptScheme(
+            id=5,
+            uri='https://id.erfgoed.net/thesauri/gebeurtenistypes',
+            labels=[
+                Label('Gebeurtenistypes', u'prefLabel', u'nl'),
+                Label('Event types', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        heritagetypes,
+        ConceptScheme(
+            id=6,
+            uri='https://id.erfgoed.net/thesauri/erfgoedtypes',
+            labels=[
+                Label('Erfgoedtypes', u'prefLabel', u'nl'),
+                Label('Heritage types', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        periods,
+        ConceptScheme(
+            id=7,
+            uri='https://id.erfgoed.net/thesauri/dateringen',
+            labels=[
+                Label('Dateringen', u'prefLabel', u'nl'),
+                Label('Periods', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
+    )
+    import_provider(
+        species,
+        ConceptScheme(
+            id=8,
+            uri='https://id.erfgoed.net/thesauri/soorten',
+            labels=[
+                Label('Soorten', u'prefLabel', u'nl'),
+                Label('Species', u'prefLabel', u'en')
+            ]
+        ),
+        db_session
     )
-    db_session = session_maker()
-    with transaction.manager:
-        import_provider(
-            trees,
-            ConceptScheme(
-                id=1,
-                uri='urn:x-skosprovider:trees',
-                labels=[
-                    Label('Verschillende soorten bomen', u'prefLabel', u'nl'),
-                    Label('Different types of trees', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            geo,
-            ConceptScheme(
-                id=2,
-                uri='urn:x-skosprovider:geo',
-                labels=[
-                    Label('Geografie', u'prefLabel', u'nl'),
-                    Label('Geography', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            styles_and_cultures,
-            ConceptScheme(
-                id=3,
-                uri='https://id.erfgoed.net/thesauri/stijlen_en_culturen',
-                labels=[
-                    Label('Stijlen en Culturen', u'prefLabel', u'nl'),
-                    Label('Styles and Cultures', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            materials,
-            ConceptScheme(
-                id=4,
-                uri='https://id.erfgoed.net/thesauri/materialen',
-                labels=[
-                    Label('Materialen', u'prefLabel', u'nl'),
-                    Label('Materials', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            eventtypes,
-            ConceptScheme(
-                id=5,
-                uri='https://id.erfgoed.net/thesauri/gebeurtenistypes',
-                labels=[
-                    Label('Gebeurtenistypes', u'prefLabel', u'nl'),
-                    Label('Event types', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            heritagetypes,
-            ConceptScheme(
-                id=6,
-                uri='https://id.erfgoed.net/thesauri/erfgoedtypes',
-                labels=[
-                    Label('Erfgoedtypes', u'prefLabel', u'nl'),
-                    Label('Heritage types', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            periods,
-            ConceptScheme(
-                id=7,
-                uri='https://id.erfgoed.net/thesauri/dateringen',
-                labels=[
-                    Label('Dateringen', u'prefLabel', u'nl'),
-                    Label('Periods', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
-        import_provider(
-            species,
-            ConceptScheme(
-                id=8,
-                uri='https://id.erfgoed.net/thesauri/soorten',
-                labels=[
-                    Label('Soorten', u'prefLabel', u'nl'),
-                    Label('Species', u'prefLabel', u'en')
-                ]
-            ),
-            db_session
-        )
     db_session.commit()
     db_session.close()
     print('--atramhasis-db-initialized--')