improved logic

Author: bodintsov

trove/render/simple_csv.py

@@ -13,7 +13,7 @@
     CardsearchParams,
     ValuesearchParams,
 )
-from trove.util.propertypath import Propertypath
+from trove.util.propertypath import Propertypath, GLOB_PATHSTEP
 from trove.vocab import mediatypes
 from trove.vocab import osfmap
 from trove.vocab.namespaces import TROVE
@@ -77,14 +77,14 @@ def first_page(self) -> dict[str, dict]:
     def _column_paths(self) -> Iterator[Propertypath]:
         _pathlists: list[Iterable[Propertypath]] = []
         if self.trove_params is not None:  # hacks
+            if GLOB_PATHSTEP in self.trove_params.attrpaths_by_type:
+                _pathlists.append(self.trove_params.attrpaths_by_type['*'])
             if isinstance(self.trove_params, ValuesearchParams):
                 _expected_card_types = set(self.trove_params.valuesearch_type_iris())
             elif isinstance(self.trove_params, CardsearchParams):
                 _expected_card_types = set(self.trove_params.cardsearch_type_iris())
             else:
                 _expected_card_types = set()
-            if '*' in self.trove_params.attrpaths_by_type:
-                _pathlists.append(self.trove_params.attrpaths_by_type['*'])
             for _type_iri in sorted(_expected_card_types, key=len):
                 try:
                     _pathlist = self.trove_params.attrpaths_by_type[_type_iri]
@@ -94,7 +94,15 @@ def _column_paths(self) -> Iterator[Propertypath]:
                     _pathlists.append(_pathlist)
         if not _pathlists:
             _pathlists.append(osfmap.DEFAULT_TABULAR_SEARCH_COLUMN_PATHS)
-        return itertools.chain.from_iterable(_pathlists)
+        return self.iter_unique(itertools.chain.from_iterable(_pathlists))
+
+    @staticmethod
+    def iter_unique(iterable):
+        _seen = set()
+        for _item in iterable:
+            if _item not in _seen:
+                _seen.add(_item)
+                yield _item
 
     def _iter_card_pages(self):
         assert not self._started

trove/util/trove_params.py

@@ -15,7 +15,7 @@
 from trove.util.propertypath import (
     PropertypathSet,
     Propertypath,
-    parse_propertypath,
+    parse_propertypath, GLOB_PATHSTEP,
 )
 from trove.util import queryparams as _qp
 from trove.vocab.namespaces import namespaces_shorthand
@@ -108,20 +108,19 @@ def _gather_attrpaths(cls, queryparams: _qp.QueryparamDict, shorthand: rdf.IriSh
                         f'expected "fields[TYPE]" (with exactly one non-empty bracketed segment)'
                         f' (got "{_param_name}")'
                     )
-                if _typenames == '*':
-                    wildcard_paths.extend(
-                        parse_propertypath(_path_value, shorthand)
-                        for _path_value in _qp.split_queryparam_value(_param_value)
-                    )
                 else:
                     for _type in _qp.split_queryparam_value(_typenames):
-                        _type_iri = shorthand.expand_iri(_type)
-                        _requested[_type_iri].extend(
-                            parse_propertypath(_path_value, shorthand)
-                            for _path_value in _qp.split_queryparam_value(_param_value)
+                        _type_key = (
+                            GLOB_PATHSTEP
+                            if _type == GLOB_PATHSTEP
+                            else shorthand.expand_iri(_type)
+                        )
+                        _requested[_type_key].extend(
+                            (
+                                parse_propertypath(_path_value, shorthand)
+                                for _path_value in _qp.split_queryparam_value(_param_value)
+                            )
                         )
-            if wildcard_paths:
-                _requested['*'].extend(wildcard_paths)
             _attrpaths = _attrpaths.with_new(freeze(_requested))
         return _attrpaths