c2cgeoportal-geoportal 2.9.0.141__py3-none-any.whl → 2.9.0.146__py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile

@@ -54,7 +54,7 @@ RUN \
     && mkdir --parent /usr/local/tomcat/webapps/ROOT/ \
     && mvif /tmp/config/print /tmp/config/print/print-apps /usr/local/tomcat/webapps/ROOT/ \
     && mv /tmp/config/geoportal/{{cookiecutter.package}}_geoportal/ /etc/geomapfish/ \
-    && mv /tmp/config/geoportal/* /etc/geomapfish/ || true \
+    && ( mv /tmp/config/geoportal/* /etc/geomapfish/ || true ) \
     && chmod g+w -R \
         /etc/geomapfish \
         /etc/mapserver \

c2cgeoportal_geoportal/scripts/theme2fts.py

@@ -34,8 +34,8 @@ from collections.abc import Iterator
 from typing import TYPE_CHECKING, Any, Optional
 
 import pyramid.config
+import sqlalchemy.orm
 import transaction
-from sqlalchemy import func
 from sqlalchemy.orm.session import Session
 
 from c2cgeoportal_geoportal.lib.bashcolor import Color, colorize
@@ -134,6 +134,9 @@ class Import:
         from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
             FullTextSearch,
             Interface,
+            LayerGroup,
+            LayerWMS,
+            LayerWMTS,
             Role,
             Theme,
         )
@@ -160,19 +163,64 @@ class Import:
             query = query.filter(Interface.name.notin_(options.exclude_interfaces))
         self.interfaces = query.all()
 
+        print("Create cache")
+        self._layerswms_cache = (
+            self.session.query(LayerWMS).options(sqlalchemy.orm.subqueryload(LayerWMS.metadatas)).all()
+        )
+        self._layerswmts_cache = (
+            self.session.query(LayerWMTS).options(sqlalchemy.orm.subqueryload(LayerWMTS.metadatas)).all()
+        )
+        self._layergroup_cache = (
+            self.session.query(LayerGroup)
+            .options(
+                sqlalchemy.orm.subqueryload(LayerGroup.children_relation),
+                sqlalchemy.orm.subqueryload(LayerWMS.metadatas),
+            )
+            .all()
+        )
+        all_themes = (
+            self.session.query(Theme)
+            .options(
+                sqlalchemy.orm.subqueryload(Theme.children_relation),
+                sqlalchemy.orm.subqueryload(LayerWMS.metadatas),
+            )
+            .all()
+        )
+
+        print("Collecting data")
+
         self.public_theme: dict[int, list[int]] = {}
         self.public_group: dict[int, list[int]] = {}
         for interface in self.interfaces:
             self.public_theme[interface.id] = []
             self.public_group[interface.id] = []
 
+        self.full_text_search: list[dict[str, Any]] = []
+
         for theme in self.session.query(Theme).filter_by(public=True).all():
             self._add_theme(theme)
 
         for role in self.session.query(Role).all():
-            for theme in self.session.query(Theme).all():
+            for theme in all_themes:
                 self._add_theme(theme, role)
 
+        print(f"Starting to fill the full-text search table with {len(self.full_text_search)} entries")
+        self.session.execute(
+            sqlalchemy.insert(FullTextSearch).values(
+                {
+                    "label": sqlalchemy.text(":label"),
+                    "role_id": sqlalchemy.text(":role_id"),
+                    "interface_id": sqlalchemy.text(":interface_id"),
+                    "lang": sqlalchemy.text(":lang"),
+                    "public": sqlalchemy.text(":public"),
+                    "ts": sqlalchemy.text("to_tsvector(:fts_lang, :fts_content)"),
+                    "actions": sqlalchemy.text("to_json(:actions)"),
+                    "from_theme": sqlalchemy.text(":from_theme"),
+                }
+            ),
+            self.full_text_search,
+        )
+
     def _add_fts(
         self,
         item: "c2cgeoportal_commons.models.main.TreeItem",
@@ -180,8 +228,6 @@ class Import:
         action: str,
         role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> None:
-        from c2cgeoportal_commons.models.main import FullTextSearch  # pylint: disable=import-outside-toplevel
-
         key = (
             item.name if self.options.name else item.id,
             interface.id,
@@ -190,22 +236,25 @@ class Import:
         if key not in self.imported:
             self.imported.add(key)
             for lang in self.languages:
-                fts = FullTextSearch()
-                fts.label = self._render_label(item, lang)
-                fts.role = role
-                fts.interface = interface
-                fts.lang = lang
-                fts.public = role is None
-                fts.ts = func.to_tsvector(
-                    self.fts_languages[lang],
-                    " ".join(
-                        [self.fts_normalizer(self._[lang].gettext(item.name))]
-                        + [v.strip() for m in item.get_metadata("searchAlias") for v in m.value.split(",")]
-                    ),
+                content = " ".join(
+                    [
+                        self.fts_normalizer(self._[lang].gettext(item.name)),
+                        *[v.strip() for m in item.get_metadata("searchAlias") for v in m.value.split(",")],
+                    ]
+                )
+                self.full_text_search.append(
+                    {
+                        "label": self._render_label(item, lang),
+                        "role_id": role.id if role is not None else None,
+                        "interface_id": interface.id,
+                        "lang": lang,
+                        "public": role is None,
+                        "fts_lang": self.fts_languages[lang],
+                        "fts_content": content,
+                        "actions": [{"action": action, "data": item.name}],
+                        "from_theme": True,
+                    }
                 )
-                fts.actions = [{"action": action, "data": item.name}]
-                fts.from_theme = True
-                self.session.add(fts)
 
     def _add_theme(
         self,

{c2cgeoportal_geoportal-2.9.0.141.dist-info → c2cgeoportal_geoportal-2.9.0.146.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9.0.141
+Version: 2.9.0.146
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9.0.141.dist-info → c2cgeoportal_geoportal-2.9.0.146.dist-info}/RECORD

@@ -63,7 +63,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.gitignore,sha2
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.pre-commit-config.yaml,sha256=rW61ldm4Yhzj_8XSb2tZHQ10hlQ6avm-3WIv7yS5S64,774
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierignore,sha256=PcDfauWwzv1pnJgC9HR1zvv06Q01CwzGzzc0iLSNcZk,9
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierrc.yaml,sha256=WbjZCtw0hBlDB2FYJanFJzAvUsNTxgwn62YBZ-Xbwkw,43
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile,sha256=MzG4WCXX1dQ1nI-fyk6SPSgByEitKxyecQIIppzXXqg,3273
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile,sha256=M_qxj20SLR1-BHnggrUJMrZcAl1AFdpzkmzlSqmkn3s,3277
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile,sha256=4dQQJF2FgRC20_0pSxIsNv7ASkkqxyXV_TFc1Pxbs9s,3116
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/README.rst,sha256=QJcaUtT05atb5x8SJYflSt0YIJkbAz0Zh39_FYtyFks,423
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=CjYe1cIL-TsKPbdxy1zStTUEGguILXpyUC63X2_Cy8c,7010
@@ -147,7 +147,7 @@ c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=oWgl5ngJaUVXDKJqJ33aZB8ET_Xc
 c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=-SL-fvAPjgiJZEKYcbhXsZm713txhtWQB18X231k6xQ,3263
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
 c2cgeoportal_geoportal/scripts/pcreate.py,sha256=xU87K_JYwFE6U4zEGjHvqNj2iiSuAhPkfWMpI576mZ8,11245
-c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=tGnwIg3IWEdxXr5OFJeIyErExa-9PS2kPSzPpz_JlXk,13725
+c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=6JqfRO5mjuimMOMjdMCpK9whSaR4DT8UdEJEp7ob2zE,15584
 c2cgeoportal_geoportal/scripts/urllogin.py,sha256=qGOOvx2ZN3qnENGzo8NScRqfFC06l1yc48vU6Qx3MBo,3319
 c2cgeoportal_geoportal/templates/login.html,sha256=Jy8CUw2KrSviePknsvWJLDqCUXam-vPhnMUv7UcD4Pc,2475
 c2cgeoportal_geoportal/templates/notlogin.html,sha256=XLCwJ8q7hqk6GIaxwhyMOaMZZZvsD_MMZaCERO8n2AY,1528
@@ -187,8 +187,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9.0.141.dist-info/METADATA,sha256=bZyhn-7UwkVws6X2KKQDjp2qyWBaUjUx_onKwwfjWqM,1923
-c2cgeoportal_geoportal-2.9.0.141.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.141.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.141.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.141.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.146.dist-info/METADATA,sha256=6UbiWLudX0HQNGRPziZAvMlPtF8b_eolRjJ1zTwdOJI,1923
+c2cgeoportal_geoportal-2.9.0.146.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.146.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.146.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.146.dist-info/RECORD,,