OneStop4All-Indexer 2.8.0.dev1__tar.gz → 2.8.0.dev3__tar.gz

{onestop4all_indexer-2.8.0.dev1 → onestop4all_indexer-2.8.0.dev3/OneStop4All_Indexer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OneStop4All-Indexer
-Version: 2.8.0.dev1
+Version: 2.8.0.dev3
 Summary: Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index
 Author: Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer
 Author-email: m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de

{onestop4all_indexer-2.8.0.dev1/OneStop4All_Indexer.egg-info → onestop4all_indexer-2.8.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OneStop4All-Indexer
-Version: 2.8.0.dev1
+Version: 2.8.0.dev3
 Summary: Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index
 Author: Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer
 Author-email: m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de

{onestop4all_indexer-2.8.0.dev1 → onestop4all_indexer-2.8.0.dev3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="OneStop4All-Indexer",
-    version="2.8.0.dev1",
+    version="2.8.0.dev3",
     description="Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index",
     author="Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer",
     author_email="m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de",

onestop4all_indexer-2.8.0.dev3/utils/configs.py

@@ -0,0 +1,91 @@
+import logging
+import os
+from jproperties import Properties
+
+log = logging.getLogger(__name__)
+
+
+app_properties = Properties()
+
+try:
+    with open("./application.properties", "rb") as config_file:
+        app_properties.load(config_file)
+except FileNotFoundError:
+    app_properties = Properties()
+    log.warning(
+        "Warnung: application.properties not found! "
+        "Using default values and environment variables only."
+    )
+
+
+def parse_bool_config(value):
+    if value is None:
+        return None
+    if value.lower() in ["false", "0", "f", "no", "n"]:
+        return False
+    elif value.lower() in ["true", "1", "t", "yes", "y"]:
+        return True
+
+
+# merge env variables and application.properties
+# if env varible is set override application.properties
+config = {
+    "cordra_endpoint": os.getenv(
+        "CORDRA_ENDPOINT",
+        default=(
+            app_properties.get("cordra_endpoint").data
+            if app_properties.get("cordra_endpoint")
+            else None
+        ),
+    ),
+    "sparql_endpoint": os.getenv(
+        "SPARQL_ENDPOINT",
+        default=(
+            app_properties.get("sparql_endpoint").data
+            if app_properties.get("sparql_endpoint")
+            else None
+        ),
+    ),
+    "solr_auth": os.getenv(
+        "SOLR_AUTH",
+        default=(
+            app_properties.get("solr_auth").data
+            if app_properties.get("solr_auth")
+            else None
+        ),
+    ),
+    "solr_core": os.getenv(
+        "SOLR_CORE",
+        default=(
+            app_properties.get("solr_core").data
+            if app_properties.get("solr_core")
+            else None
+        ),
+    ),
+    "solr_url": os.getenv(
+        "SOLR_URL",
+        default=(
+            app_properties.get("solr_url").data
+            if app_properties.get("solr_url")
+            else None
+        ),
+    ),
+    "mailserver_url": os.getenv(
+        "MAILSERVER_URL",
+        default=(
+            app_properties.get("mailserver_url").data
+            if app_properties.get("mailserver_url")
+            else None
+        ),
+    ),
+    "reset_index": parse_bool_config(
+        os.getenv(
+            "RESET_INDEX",
+            default=(
+                app_properties.get("reset_index").data
+                if app_properties.get("reset_index")
+                else None
+            ),
+        )
+    ),
+}

onestop4all_indexer-2.8.0.dev1/utils/configs.py

@@ -1,55 +0,0 @@
-import logging
-import os
-from jproperties import Properties
-
-log = logging.getLogger(__name__)
-
-
-app_properties = Properties()
-
-try:
-    with open("./application.properties", "rb") as config_file:
-        app_properties.load(config_file)
-except FileNotFoundError:
-    app_properties = Properties()
-    log.warning(
-        "Warnung: application.properties not found! "
-        "Using default values and environment variables only."
-    )
-
-
-def parse_bool_config(value):
-    if value.lower() in ["false", "0", "f", "no", "n"]:
-        return False
-    elif value.lower() in ["true", "1", "t", "yes", "y"]:
-        return True
-
-
-# merge env variables and application.properties
-# if env varible is set override application.properties
-config = {
-    "cordra_endpoint": os.getenv(
-        "CORDRA_ENDPOINT", default=app_properties.get("cordra_endpoint").data
-    ),
-    "sparql_endpoint": os.getenv(
-        "SPARQL_ENDPOINT", default=app_properties.get("sparql_endpoint").data
-    ),
-    "solr_auth": os.getenv(
-        "SOLR_AUTH", default=app_properties.get("solr_auth").data
-    ),
-    "solr_core": os.getenv(
-        "SOLR_CORE", default=app_properties.get("solr_core").data
-    ),
-    "solr_url": os.getenv(
-        "SOLR_URL", default=app_properties.get("solr_url").data
-    ),
-    "mailserver_url": os.getenv(
-        "MAILSERVER_URL", default=app_properties.get("mailserver_url").data
-    ),
-    "reset_index": parse_bool_config(
-        os.getenv(
-            "RESET_INDEX",
-            default=app_properties.get("reset_index").data,
-        )
-    ),
-}