Merge pull request #117 from opengisch/modelfilter

possiblity to pass model list that is excluded from language search
opengisch · Nov 5, 2024 · eac8ec9 · eac8ec9
2 parents ea13cc6 + 168cb78
commit eac8ec9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/modelbaker/dbconnector/db_connector.py b/modelbaker/dbconnector/db_connector.py
@@ -427,9 +427,9 @@ def get_translation_handling(self) -> tuple[bool, str]:
         """
         return False, ""
 
-    def get_available_languages(self) -> list[str]:
+    def get_available_languages(self, irrelevant_models: list[str]) -> list[str]:
         """
-        Returns a list of available languages in the t_ili2db_nls table.
+        Returns a list of available languages in the t_ili2db_nls table and ignores the values for the irrelevant models
         """
         return []
 

diff --git a/modelbaker/dbconnector/gpkg_connector.py b/modelbaker/dbconnector/gpkg_connector.py
@@ -1235,17 +1235,22 @@ def set_ili2db_sequence_value(self, value):
     def get_translation_handling(self) -> tuple[bool, str]:
         return self._table_exists(GPKG_NLS_TABLE) and self._lang != "", self._lang
 
-    def get_available_languages(self):
+    def get_available_languages(self, irrelevant_models=[]):
         if not self._table_exists(GPKG_NLS_TABLE):
             return []
 
         cursor = self.conn.cursor()
         cursor.execute(
             """SELECT DISTINCT
             lang
-            FROM "{}";
+            FROM "{t_ili2db_nls}"
+            WHERE substr(iliElement, 0, instr(iliElement, '.')) NOT IN ({model_list})
+            ;
             """.format(
-                GPKG_NLS_TABLE
+                t_ili2db_nls=GPKG_NLS_TABLE,
+                model_list=",".join(
+                    [f"'{modelname}'" for modelname in irrelevant_models]
+                ),
             )
         )
         records = cursor.fetchall()

diff --git a/modelbaker/dbconnector/mssql_connector.py b/modelbaker/dbconnector/mssql_connector.py
@@ -1246,16 +1246,23 @@ def set_ili2db_sequence_value(self, value):
     def get_translation_handling(self) -> tuple[bool, str]:
         return self._table_exists(NLS_TABLE) and self._lang != "", self._lang
 
-    def get_available_languages(self):
+    def get_available_languages(self, irrelevant_models=[]):
         if self.schema and self._table_exists(NLS_TABLE):
             cur = self.conn.cursor()
             cur.execute(
                 """
                 SELECT DISTINCT
                 lang
                 FROM {schema}.t_ili2db_nls
+                WHERE
+                left(iliElement, charindex('.', iliElement)-1) NOT IN ({model_list})
                 """
-            ).format(schema=self.schema)
+            ).format(
+                schema=self.schema,
+                model_list=",".join(
+                    [f"'{modelname}'" for modelname in irrelevant_models]
+                ),
+            )
 
             return [row.lang for row in cur.fetchall()]
         return []
diff --git a/modelbaker/dbconnector/pg_connector.py b/modelbaker/dbconnector/pg_connector.py
@@ -1371,7 +1371,7 @@ def get_schemas(self):
     def get_translation_handling(self) -> tuple[bool, str]:
         return self._table_exists(PG_NLS_TABLE) and self._lang != "", self._lang
 
-    def get_available_languages(self):
+    def get_available_languages(self, irrelevant_models=[]):
         if self.schema and self._table_exists(PG_NLS_TABLE):
             cur = self.conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
             cur.execute(
@@ -1380,8 +1380,16 @@ def get_available_languages(self):
                     SELECT DISTINCT
                     lang
                     FROM {schema}.t_ili2db_nls
+                    WHERE
+                    split_part(iliElement,'.',1) NOT IN ({model_list})
                     """
-                ).format(schema=sql.Identifier(self.schema))
+                ).format(
+                    schema=sql.Identifier(self.schema),
+                    model_list=sql.SQL(", ").join(
+                        sql.Placeholder() * len(irrelevant_models)
+                    ),
+                ),
+                irrelevant_models,
             )
             return [row["lang"] for row in cur.fetchall()]
         return []