concept get | decoding concept id

OpenConceptLab · Jul 6, 2021 · f6c77c6 · f6c77c6
1 parent 9144511
commit f6c77c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/common/utils.py b/core/common/utils.py
@@ -614,8 +614,8 @@ def is_url_encoded_string(string, lower=True):
     return string == encoded_string
 
 
-def decode_string(string):
-    return parse.unquote_plus(string)
+def decode_string(string, plus=True):
+    return parse.unquote_plus(string) if plus else parse.unquote(string)
 
 
 def encode_string(string, **kwargs):

diff --git a/core/concepts/models.py b/core/concepts/models.py
@@ -11,7 +11,7 @@
 from core.common.tasks import process_hierarchy_for_new_concept, process_hierarchy_for_concept_version, \
     process_hierarchy_for_new_parent_concept_version
 from core.common.utils import reverse_resource, parse_updated_since_param, generate_temp_version, drop_version, \
-    encode_string
+    encode_string, decode_string
 from core.concepts.constants import CONCEPT_TYPE, LOCALES_FULLY_SPECIFIED, LOCALES_SHORT, LOCALES_SEARCH_INDEX_TERM, \
     CONCEPT_WAS_RETIRED, CONCEPT_IS_ALREADY_RETIRED, CONCEPT_IS_ALREADY_NOT_RETIRED, CONCEPT_WAS_UNRETIRED, \
     PERSIST_CLONE_ERROR, PERSIST_CLONE_SPECIFY_USER_ERROR, ALREADY_EXISTS, CONCEPT_REGEX
@@ -369,7 +369,8 @@ def get_base_queryset(cls, params):  # pylint: disable=too-many-branches,too-man
                 queryset = queryset.filter(cls.get_iexact_or_criteria('sources__version', container_version))
         if concept:
             mnemonics = [concept, encode_string(concept, safe=' '), encode_string(concept, safe='+'),
-                         encode_string(concept, safe='+%'), encode_string(concept, safe='% +')]
+                         encode_string(concept, safe='+%'), encode_string(concept, safe='% +'),
+                         decode_string(concept), decode_string(concept, False)]
             queryset = queryset.filter(mnemonic__in=mnemonics)
         if concept_version:
             queryset = queryset.filter(cls.get_iexact_or_criteria('version', concept_version))