[STAC] Check for greater or equal to ADDON_STAC_MINMATCH (previously greater only)

Author: jjrom

.gitignore

@@ -5,9 +5,10 @@ pgdata.old
 app/resto/addons
 saml/cert/server.crt
 saml/cert/server.pem
-docker-compose.local.yml
-config-local.env
 errors.log
 .private
 .DS_Store
 .php-cs-fixer.cache
+# Local config and attached docker-compose
+_config*.env
+_docker-compose*.yml

app/resto/core/RestoConstants.php

@@ -20,7 +20,7 @@ class RestoConstants
     // [IMPORTANT] Starting resto 7.x, default routes are defined in RestoRouter class
 
     // resto version
-    const VERSION = '7.0.0-rc.3';
+    const VERSION = '7.0.0-rc.4';
 
     /* ============================================================
      *              NEVER EVER TOUCH THESE VALUES

app/resto/core/addons/STAC.php

@@ -349,7 +349,7 @@ public function getChildren($params)
         // Initialize router to process each children individually
         $router = new RestoRouter($this->context, $this->user);
 
-        $links = $this->stacUtil->getRootCatalogLinks();
+        $links = $this->stacUtil->getRootCatalogLinks($this->options['minMatch']);
         for ($i = 0, $ii = count($links); $i < $ii; $i++) {
             if ($links[$i]['rel'] == 'child') {
                 try {
@@ -1018,7 +1018,7 @@ private function load($params = array())
 
         // Root
         if ($nbOfSegments === 0) {
-            $this->links = $this->stacUtil->getRootCatalogLinks();
+            $this->links = $this->stacUtil->getRootCatalogLinks($this->options['minMatch']);
         }
 
         // View special case
@@ -1279,7 +1279,7 @@ private function setCatalogsLinksFromFacet($params)
                     return $this->setFeatureCollection($leafValue, $params);
                 }
             }
-
+            
             // Add parent link
             if ($nbOfSegments > 1) {
                 $this->links[] = array(
@@ -1303,7 +1303,7 @@ private function setCatalogsLinksFromFacet($params)
                 }
 
                 $matched = (integer) $result['matched'];
-                if ($matched > $this->options['minMatch']) {
+                if ($matched >= $this->options['minMatch']) {
                     $link = array(
                         'rel' => ((integer) $result['isleaf']) === 1 ? 'items' : 'child',
                         'title' => $result['value'],

app/resto/core/utils/STACUtil.php

@@ -61,7 +61,7 @@ public function __construct($context, $user)
      *
      * @return array
      */
-    public function getRootCatalogLinks($minMatch = 0)
+    public function getRootCatalogLinks($minMatch)
     {
         $links = array();
         $facets = $this->getFacets($minMatch);
@@ -189,7 +189,7 @@ public function getFacets($minMatch)
                 if ($result['type'] === 'collection') {
                     $facets['count'] =  $matched;
                 } else {
-                    if ($matched > $minMatch) {
+                    if ($matched >= $minMatch) {
                         // Catalog
                         if ($result['type'] === 'catalog' || $result['type'] === 'hashtag') {
                             $facets[$result['type'] . 's'] = $matched;

docker-compose.dev.yml

@@ -10,8 +10,6 @@ services:
       - ./app/resto/core:/app/resto/core:ro
       - ./app/vendor:/app/vendor:ro
       - ./build/resto/container_root/cont-init.d/:/etc/cont-init.d/:ro
-      - /Users/jrom/Devel/cnes-valorisation-planeto/components/catalog/addons/resto-addon-pdssp/src/MarsPDSSPModel.php:/app/resto/addons/MarsPDSSPModel.php:ro
-      - /Users/jrom/Devel/dea-access/components/resto-dea/addons/resto-addon-dea/src/DEAModel.php:/app/resto/addons/DEAModel.php:ro
   restodb:
     volumes:
-      - ./postgresql-conf/postgresql-dev.conf:/etc/postgresql.conf
+      - ./postgresql-conf/postgresql-dev.conf:/var/lib/postgresql/data/postgresql.conf

docker-compose.yml

@@ -55,5 +55,5 @@ services:
       interval: 1m
       timeout: 5s
     volumes:
-      - ./postgresql-conf/postgresql.conf:/etc/postgresql.conf
+      - ./postgresql-conf/postgresql.conf:/var/lib/postgresql/data/postgresql.conf
       - database_data:/var/lib/postgresql/data