localcosmos-app-kit 0.9.18__py3-none-any.whl → 0.10.0__py3-none-any.whl

app_kit/appbuilder/AppReleaseBuilder.py

@@ -1959,6 +1959,63 @@ class AppReleaseBuilder(AppBuilderBase):
             localized_long_text = self.get_localized_taxonprofile_text(text_dict['longTextKey'], glossarized_locale, app_locale)
         
         return localized_short_text, localized_long_text
+    
+    def get_localized_taxon_profile(self, profile_json, language_code):
+        
+        glossarized_locale_filepath = self._app_glossarized_locale_filepath(language_code)
+                    
+        glossarized_locale = {}
+        
+        if os.path.isfile(glossarized_locale_filepath):
+            with open(glossarized_locale_filepath, 'r') as f:
+                glossarized_locale = json.loads(f.read())
+        
+        app_locale = self.meta_app.localizations[language_code]
+        
+        localized_profile_json = profile_json.copy()
+        
+        localized_short_profile = self.get_localized_taxonprofile_text(localized_profile_json['shortProfile'], glossarized_locale, app_locale)
+        localized_profile_json['shortProfile'] = localized_short_profile
+        
+        for index, text_dict in enumerate(profile_json['texts'], 0):
+            
+            localized_short_text, localized_long_text = self.get_localized_taxonprofile_taxon_text(text_dict, glossarized_locale, app_locale)
+                
+            localized_profile_json['texts'][index]['shortText'] = localized_short_text
+            localized_profile_json['texts'][index]['longText'] = localized_long_text
+            
+        
+        for c_index, category in enumerate(profile_json['categorizedTexts'], 0):
+            
+            localized_category = category.copy()
+            
+            localized_category_name = self.get_localized_taxonprofile_text(category['category'], glossarized_locale, app_locale)
+                
+            if localized_category:
+                localized_category['category'] = localized_category_name
+            
+            for index, text_dict in enumerate(category['texts'], 0):
+                localized_short_text, localized_long_text = self.get_localized_taxonprofile_taxon_text(text_dict, glossarized_locale, app_locale)
+                
+                localized_category['texts'][index]['shortText'] = localized_short_text
+                localized_category['texts'][index]['longText'] = localized_long_text
+                
+            localized_profile_json['categorizedTexts'][c_index] = localized_category
+            
+        # localize seo, no glossarized locale
+        localized_seo = localized_profile_json['seo'].copy()
+        title = localized_seo['title']
+        meta_description = localized_seo['metaDescription']
+        
+        if title and title in app_locale:
+            localized_seo = app_locale[title]
+            
+        if meta_description and meta_description in app_locale:
+            localized_seo['metaDescription'] = app_locale[meta_description]
+
+        localized_profile_json['seo'] = localized_seo
+        
+        return localized_profile_json
         
     def _build_TaxonProfiles(self, app_generic_content):
 
@@ -1993,6 +2050,11 @@ class AppReleaseBuilder(AppBuilderBase):
 
         if not os.path.isdir(app_absolute_taxonprofiles_path):
             os.makedirs(app_absolute_taxonprofiles_path)
+            
+        # morphotype paths
+        app_relative_morphotype_profiles_folder = os.path.join(app_relative_taxonprofiles_folder, 'morphotypes')
+        self.build_features[generic_content_type]['localizedMorphotypeFiles'] = {}
+        app_absolute_morphotype_profiles_path = os.path.join(app_absolute_taxonprofiles_path, 'morphotypes')
 
 
         collected_taxa = taxon_profiles.collected_taxa(published_only=True)
@@ -2081,8 +2143,10 @@ class AppReleaseBuilder(AppBuilderBase):
         self.build_features[generic_content_type]['localizedFiles'] = {}
         
         for profile_taxon in active_collected_taxa:
+            
+            morphotype = None
 
-            profile_json = jsonbuilder.build_taxon_profile(profile_taxon, 
+            profile_json = jsonbuilder.build_taxon_profile(profile_taxon, morphotype,
                                                            languages=self.meta_app.languages())
 
             if profile_json is not None:
@@ -2101,64 +2165,13 @@ class AppReleaseBuilder(AppBuilderBase):
                 # localized taxon profiles for faster language load
                 for language_code in self.meta_app.languages():
                     
-                    glossarized_locale_filepath = self._app_glossarized_locale_filepath(language_code)
-                    
-                    glossarized_locale = {}
-                    
-                    if os.path.isfile(glossarized_locale_filepath):
-                        with open(glossarized_locale_filepath, 'r') as f:
-                            glossarized_locale = json.loads(f.read())
+                    localized_profile_json = self.get_localized_taxon_profile(profile_json, language_code)
                     
                     relative_localized_taxonprofiles_folder = os.path.join(
                         app_relative_taxonprofiles_folder, language_code)
                     
                     if language_code not in self.build_features[generic_content_type]['localizedFiles']:
                         self.build_features[generic_content_type]['localizedFiles'][language_code] = '/{0}'.format(relative_localized_taxonprofiles_folder)
-        
-                    app_locale = self.meta_app.localizations[language_code]
-                    
-                    localized_profile_json = profile_json.copy()
-                    
-                    localized_short_profile = self.get_localized_taxonprofile_text(localized_profile_json['shortProfile'], glossarized_locale, app_locale)
-                    localized_profile_json['shortProfile'] = localized_short_profile
-                    
-                    for index, text_dict in enumerate(profile_json['texts'], 0):
-                        
-                        localized_short_text, localized_long_text = self.get_localized_taxonprofile_taxon_text(text_dict, glossarized_locale, app_locale)
-                            
-                        localized_profile_json['texts'][index]['shortText'] = localized_short_text
-                        localized_profile_json['texts'][index]['longText'] = localized_long_text
-                        
-                    
-                    for c_index, category in enumerate(profile_json['categorizedTexts'], 0):
-                        
-                        localized_category = category.copy()
-                        
-                        localized_category_name = self.get_localized_taxonprofile_text(category['category'], glossarized_locale, app_locale)
-                            
-                        if localized_category:
-                            localized_category['category'] = localized_category_name
-                        
-                        for index, text_dict in enumerate(category['texts'], 0):
-                            localized_short_text, localized_long_text = self.get_localized_taxonprofile_taxon_text(text_dict, glossarized_locale, app_locale)
-                            
-                            localized_category['texts'][index]['shortText'] = localized_short_text
-                            localized_category['texts'][index]['longText'] = localized_long_text
-                            
-                        localized_profile_json['categorizedTexts'][c_index] = localized_category
-                        
-                    # localize seo, no glossarized locale
-                    localized_seo = localized_profile_json['seo'].copy()
-                    title = localized_seo['title']
-                    meta_description = localized_seo['metaDescription']
-                    
-                    if title and title in app_locale:
-                        localized_seo = app_locale[title]
-                        
-                    if meta_description and meta_description in app_locale:
-                        localized_seo['metaDescription'] = app_locale[meta_description]
-
-                    localized_profile_json['seo'] = localized_seo
                     
                     absolute_localized_taxonprofiles_folder = os.path.join(
                         app_absolute_taxonprofiles_path, language_code)
@@ -2177,7 +2190,52 @@ class AppReleaseBuilder(AppBuilderBase):
 
                     with open(localized_profile_filepath, 'w', encoding='utf-8') as f:
                         json.dump(localized_profile_json, f, indent=4, ensure_ascii=False)
+                        
+            # build morphotype profiles
+            morphotypes = []
+            taxon_profile = TaxonProfile.objects.filter(taxon_profiles=taxon_profiles,
+                taxon_source=profile_taxon.taxon_source, taxon_latname=profile_taxon.taxon_latname,
+                taxon_author=profile_taxon.taxon_author).first()
+
+            if taxon_profile and taxon_profile.morphotype_profiles:
+                morphotypes = taxon_profile.morphotype_profiles.values_list('morphotype', flat=True)
                 
+                
+            for morphotype in morphotypes:
+
+                morphotype_profile_json = jsonbuilder.build_taxon_profile(profile_taxon, morphotype,
+                                                           languages=self.meta_app.languages())
+
+                if morphotype_profile_json is not None:
+
+                    for language_code in self.meta_app.languages():
+                        
+                        localized_profile_json = self.get_localized_taxon_profile(morphotype_profile_json, language_code)
+                        
+                        relative_localized_morphotype_profiles_folder = os.path.join(
+                            app_relative_morphotype_profiles_folder, language_code)
+                        
+                        if language_code not in self.build_features[generic_content_type]['localizedMorphotypeFiles']:
+                            self.build_features[generic_content_type]['localizedMorphotypeFiles'][language_code] = '/{0}'.format(relative_localized_morphotype_profiles_folder)
+                            
+                        
+                        absolute_localized_morphotype_profiles_folder = os.path.join(
+                            app_absolute_morphotype_profiles_path, language_code)
+                        
+                        if not os.path.isdir(absolute_localized_morphotype_profiles_folder):
+                            os.makedirs(absolute_localized_morphotype_profiles_folder)
+                        
+                        localized_source_folder = os.path.join(absolute_localized_morphotype_profiles_folder,
+                                                           profile_taxon.taxon_source)
+                        
+                        if not os.path.isdir(localized_source_folder):
+                            os.makedirs(localized_source_folder)
+                            
+                        localized_morphotype_profile_filepath = os.path.join(localized_source_folder,
+                                                              '{0}_{1}.json'.format(profile_taxon.name_uuid, morphotype))
+                        
+                        with open(localized_morphotype_profile_filepath, 'w', encoding='utf-8') as f:
+                            json.dump(morphotype_profile_json, f, indent=4, ensure_ascii=False)
 
 
         # build search index and registry

app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py

@@ -52,7 +52,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         installed_taxonomic_sources = [s[0] for s in settings.TAXONOMY_DATABASES]
         return installed_taxonomic_sources
 
-
+    '''
     def collect_node_traits(self, node):
 
         #self.app_release_builder.logger.info('collecting node traits for {0}'.format(node.meta_node.name))
@@ -95,6 +95,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         #self.app_release_builder.logger.info('finished collecting')
 
         return node_traits
+    '''
     
 
     def get_vernacular_name_from_nature_guides(self, lazy_taxon):
@@ -109,7 +110,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         return template_contents
 
     # languages is for the vernacular name only, the rest are keys for translation
-    def build_taxon_profile(self, profile_taxon, languages):
+    def build_taxon_profile(self, profile_taxon, morphotype, languages):
         
         lazy_taxon = LazyTaxon(instance=profile_taxon)
 
@@ -118,7 +119,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         # get the profile
         db_profile = TaxonProfile.objects.filter(taxon_profiles=self.generic_content,
             taxon_source=profile_taxon.taxon_source, taxon_latname=profile_taxon.taxon_latname,
-            taxon_author=profile_taxon.taxon_author).first()
+            taxon_author=profile_taxon.taxon_author, morphotype=morphotype).first()
         
         
         taxon_profile_json = self.app_release_builder.taxa_builder.serialize_taxon_extended(lazy_taxon)
@@ -126,8 +127,9 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         # if the taxonomic db got updated, still use the old taxon latname and author here
         taxon_profile_json['taxonLatname'] = lazy_taxon.taxon_latname
         taxon_profile_json['taxonAuthor'] = lazy_taxon.taxon_author
+        images = []
         
-        images = self.app_release_builder.taxa_builder.serialize_taxon_images(lazy_taxon)
+        images = self.app_release_builder.taxa_builder.serialize_taxon_images(lazy_taxon, morphotype=morphotype)
 
         is_featured = False
         if db_profile:
@@ -139,6 +141,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
 
         taxon_profile_json.update({
             'taxonProfileId': db_profile.id if db_profile else None,
+            'morphotype': db_profile.morphotype if db_profile else None,
             'vernacular' : {},
             'allVernacularNames' : {},
             'nodeNames' : [], # if the taxon occurs in a nature guide, primary_language only
@@ -151,7 +154,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
             'synonyms' : [],
             'templateContents' : [],
             'genericForms' : self.collect_usable_generic_forms(profile_taxon),
-            'taxonRelationships': self.collect_taxon_relationships(profile_taxon),
+            'taxonRelationships': self.collect_taxon_relationships(profile_taxon) if not morphotype else [],
             'tags' : [],
             'seo': {
                 'title': None,
@@ -162,14 +165,15 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
             'isFeatured': is_featured,
         })
 
-        synonyms = profile_taxon.synonyms()
-        for synonym in synonyms:
-            synonym_entry = {
-                'taxonLatname' : synonym.taxon_latname,
-                'taxonAuthor' : synonym.taxon_author,
-            }
+        if not morphotype:
+            synonyms = profile_taxon.synonyms()
+            for synonym in synonyms:
+                synonym_entry = {
+                    'taxonLatname' : synonym.taxon_latname,
+                    'taxonAuthor' : synonym.taxon_author,
+                }
 
-            taxon_profile_json['synonyms'].append(synonym_entry)
+                taxon_profile_json['synonyms'].append(synonym_entry)
 
         for language_code in languages:
 
@@ -186,6 +190,24 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
             
             # template contents
             taxon_profile_json['templateContents'] = self.get_taxon_profile_template_content_links(profile_taxon, language_code)
+            
+        # respect additional languages for vernacular names as defined in taxon profiles options
+        include_vernacular_names_languages_option = self.generic_content.get_option(self.meta_app,
+                                                                                   'include_vernacular_names_languages')
+        if include_vernacular_names_languages_option:
+            additional_languages = [lang.strip() for lang in include_vernacular_names_languages_option.split(',') if lang.strip()]
+            for language_code in additional_languages:
+                if language_code not in languages:
+                    preferred_vernacular_name = lazy_taxon.get_preferred_vernacular_name(language_code,
+                                                                                        self.meta_app)
+
+                    taxon_profile_json['vernacular'][language_code] = preferred_vernacular_name
+
+                    all_vernacular_names = profile_taxon.all_vernacular_names(self.meta_app,
+                                                                              languages=[language_code])
+
+                    names_list = [name_reference['name'] for name_reference in all_vernacular_names]
+                    taxon_profile_json['allVernacularNames'][language_code] = names_list
 
         # get taxon_profile_images
         if db_profile:
@@ -207,7 +229,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
         # get information (traits, node_names) from nature guides if possible
         # collect node images
         # only use occurrences in nature guides of this app
-        node_occurrences = self.app_release_builder.taxa_builder.get_nature_guide_occurrences(lazy_taxon)
+        node_occurrences = self.app_release_builder.taxa_builder.get_nature_guide_occurrences(lazy_taxon, morphotype=morphotype)
 
         # collect traits of upward branch in tree (higher taxa)
         parent_nuids = set([])
@@ -287,7 +309,8 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
 
         if db_profile:
             
-            taxon_profile_json['morphotypeProfiles'] = self.collect_morphotype_profiles(db_profile, languages)
+            if not morphotype:
+                taxon_profile_json['morphotypeProfiles'] = self.collect_morphotype_profiles(db_profile, languages)
             
             taxon_profile_json['shortProfile'] = db_profile.short_profile
             
@@ -469,7 +492,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
                 'taxonProfileId': morphotype.id,
                 'parentTaxonProfileId': taxon_profile.id,
                 'morphotype': morphotype.morphotype,
-                'taxon': self.app_release_builder.taxa_builder.serialize_taxon(lazy_taxon),
+                'taxon': self.app_release_builder.taxa_builder.serialize_taxon_extended(lazy_taxon),
                 'vernacular' : {},
                 'image': image_entry,
             }

app_kit/appbuilder/TaxonBuilder.py

@@ -41,8 +41,7 @@ class TaxaBuilder(ContentImagesJSONBuilder):
         
     def serialize_taxon(self, lazy_taxon):
         taxon_serializer = TaxonSerializer(lazy_taxon, self)
-        return taxon_serializer.serialize()
-    
+        return taxon_serializer.serialize()    
     
     def serialize_taxon_extended(self, lazy_taxon):
         taxon_serializer = TaxonSerializer(lazy_taxon, self)
@@ -66,9 +65,9 @@ class TaxaBuilder(ContentImagesJSONBuilder):
                                   accepted_name_uuid)
     
     
-    def serialize_taxon_images(self, lazy_taxon):
+    def serialize_taxon_images(self, lazy_taxon, morphotype=None):
         taxon_serializer = TaxonSerializer(lazy_taxon, self)
-        return taxon_serializer.serialize_images()
+        return taxon_serializer.serialize_images(morphotype=morphotype)
     
     
     def get_nature_guide_ids(self):
@@ -80,7 +79,7 @@ class TaxaBuilder(ContentImagesJSONBuilder):
         return self.nature_guide_ids
     
     
-    def get_nature_guide_occurrences(self, lazy_taxon):
+    def get_nature_guide_occurrences(self, lazy_taxon, morphotype=None):
         nature_guide_ids = self.get_nature_guide_ids()
         
         if lazy_taxon.taxon_source in self.installed_taxonomic_sources:
@@ -88,6 +87,7 @@ class TaxaBuilder(ContentImagesJSONBuilder):
             meta_nodes = MetaNode.objects.filter(
                 nature_guide_id__in=nature_guide_ids,
                 node_type='result',
+                morphotype=morphotype,
                 name_uuid = lazy_taxon.name_uuid).values_list('pk', flat=True)
 
             node_occurrences = NatureGuidesTaxonTree.objects.filter(nature_guide_id__in=nature_guide_ids,
@@ -211,12 +211,13 @@ class TaxonSerializer:
         
         return taxon_json_copy
     
-    def get_taxon_profile(self):
+    def get_taxon_profile(self, morphotype=None):
         taxon_profile = None
         
         taxon_profile_qry = TaxonProfile.objects.filter(
             taxon_profiles=self.taxa_builder.taxon_profiles,
-            name_uuid=self.lazy_taxon.name_uuid).first()
+            name_uuid=self.lazy_taxon.name_uuid,
+            morphotype=morphotype).first()
         
         if taxon_profile_qry and taxon_profile_qry.publication_status != 'draft':
             taxon_profile = taxon_profile_qry
@@ -224,19 +225,23 @@ class TaxonSerializer:
         return taxon_profile
         
     
-    def serialize_images(self):
+    def serialize_images(self, morphotype=None):
         
         name_uuid_str = str(self.lazy_taxon.name_uuid)
+        cache_key=name_uuid_str
+        
+        if morphotype:
+            cache_key = name_uuid_str + '_' + morphotype
         
-        if name_uuid_str in self.taxa_builder.cache['images']:
-            taxon_images = self.taxa_builder.cache['images'][name_uuid_str]
+        if cache_key in self.taxa_builder.cache['images']:
+            taxon_images = self.taxa_builder.cache['images'][cache_key]
         
         else:
                 
             collected_content_image_ids = set([])
             collected_image_store_ids = set([])
             
-            taxon_profile = self.get_taxon_profile()
+            taxon_profile = self.get_taxon_profile(morphotype=morphotype)
             
             taxon_images = {
                 'primary': None,
@@ -272,8 +277,9 @@ class TaxonSerializer:
                     taxon_images['primary'] = image_entry
             
             
+
             # images from nature guides
-            node_occurrences = self.taxa_builder.get_nature_guide_occurrences(self.lazy_taxon)
+            node_occurrences = self.taxa_builder.get_nature_guide_occurrences(self.lazy_taxon, morphotype=morphotype)
             
             for node in node_occurrences:
             
@@ -297,30 +303,31 @@ class TaxonSerializer:
                         
                         if taxon_images['primary'] == None:
                             taxon_images['primary'] = image_entry
-            
+                
                     
             # get taxonomic images
-            content_images_taxon = ContentImage.objects.filter(image_store__taxon_source=self.lazy_taxon.taxon_source,
-                                        image_store__taxon_latname=self.lazy_taxon.taxon_latname,
-                                        image_store__taxon_author=self.lazy_taxon.taxon_author).exclude(
-                                        pk__in=list(collected_content_image_ids))
+            if not morphotype:
+                content_images_taxon = ContentImage.objects.filter(image_store__taxon_source=self.lazy_taxon.taxon_source,
+                                            image_store__taxon_latname=self.lazy_taxon.taxon_latname,
+                                            image_store__taxon_author=self.lazy_taxon.taxon_author).exclude(
+                                            pk__in=list(collected_content_image_ids))
 
-            #self.app_release_builder.logger.info('Found {0} images for {1}'.format(taxon_images.count(), profile_taxon.taxon_latname))
+                #self.app_release_builder.logger.info('Found {0} images for {1}'.format(taxon_images.count(), profile_taxon.taxon_latname))
 
-            for taxon_image in content_images_taxon:
+                for taxon_image in content_images_taxon:
 
-                if taxon_image is not None and taxon_image.id not in collected_content_image_ids and taxon_image.image_store.id not in collected_image_store_ids:
+                    if taxon_image is not None and taxon_image.id not in collected_content_image_ids and taxon_image.image_store.id not in collected_image_store_ids:
 
-                    image_entry = self.taxa_builder.get_image_json(taxon_image)
-                    taxon_images['taxonImages'].append(image_entry)
-                    
-                    if taxon_images['primary'] == None:
-                        taxon_images['primary'] = image_entry
+                        image_entry = self.taxa_builder.get_image_json(taxon_image)
+                        taxon_images['taxonImages'].append(image_entry)
+                        
+                        if taxon_images['primary'] == None:
+                            taxon_images['primary'] = image_entry
 
-                    collected_content_image_ids.add(taxon_image.id)
-                    collected_image_store_ids.add(taxon_image.image_store.id)
+                        collected_content_image_ids.add(taxon_image.id)
+                        collected_image_store_ids.add(taxon_image.image_store.id)
     
-            self.taxa_builder.cache['images'][name_uuid_str] = taxon_images
+            self.taxa_builder.cache['images'][cache_key] = taxon_images
             
         taxon_images_copy = copy.deepcopy(taxon_images)
         

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_taxon.html

@@ -29,7 +29,7 @@
             <div class="mt-5">
                 <h3>{% trans 'Taxon Profile' %}</h3>
                 {% if taxon_profile %}
-                    <a href="{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon.taxon_source taxon.name_uuid %}">{{ taxon }}</a>
+                    <a href="{% url 'manage_taxon_profile' meta_app.id taxon_profile.id %}">{{ taxon }}</a>
                 {% else %}
                     {% trans 'This taxon does not have a taxon profile' %}
                 {% endif %}

app_kit/features/taxon_profiles/forms.py

@@ -29,6 +29,9 @@ class TaxonProfilesOptionsForm(GenericFormChoicesMixin, GenericContentOptionsFor
     
     enable_taxonomic_navigation = forms.BooleanField(required=False, label=_('Enable Taxonomic Navigation'))
     
+    include_vernacular_names_languages = forms.CharField(required=False, label=_('Include Vernacular Names Languages'),
+        help_text=_('A comma-separated list of language codes (e.g. "en,de,fr") to include vernacular names from. Leave empty to include all available languages.'))
+    
     version = forms.CharField(help_text=_('You can manually set you own version here. This will not affect the automated versioning.'), required=False)
 
 
@@ -94,8 +97,6 @@ class ManageTaxonTextsForm(LocalizeableForm):
 
         self.layoutable_simple_fields = []
         
-        self.has_categories = False
-        
         super().__init__(*args, **kwargs)
         
         categories = [None] + list(TaxonTextTypeCategory.objects.filter(taxon_profiles=taxon_profiles))
@@ -105,34 +106,12 @@ class ManageTaxonTextsForm(LocalizeableForm):
         if taxon_profile.taxon_text_set:
             allowed_text_types = taxon_profile.taxon_text_set.text_types.values_list('pk', flat=True)
         
-        if len(categories) > 1:
-            self.has_categories = True
-        
-        for category_index, category in enumerate(categories, 1):
-
-            types = TaxonTextType.objects.filter(taxon_profiles=taxon_profiles, category=category, pk__in=allowed_text_types).order_by('category', 'position')
-
-            category_label = 'uncategorized'
-            if category:
-                category_label = category.name
-                
-            category_helper_field = forms.CharField(widget=forms.HiddenInput(), label=category_label, required=False)
-            category_helper_field.category = category
-            category_helper_field.is_category_field = True
-            category_helper_field.text_type_count = types.count()
-            category_helper_field.is_first_category = False
-            category_helper_field.is_last = False
-            
-            if category_index == 2:
-                category_helper_field.is_first_category = True
-                
-            if not types:
-                category_helper_field.is_last = True
+        for category in categories:
             
-            self.fields[category_label] = category_helper_field
+            types = TaxonTextType.objects.filter(taxon_profiles=taxon_profiles, category=category, pk__in=allowed_text_types).order_by('category', 'position')
             
             for field_index, text_type in enumerate(types, 1):
-
+                
                 short_text_field_name = text_type.text_type
                 
                 self.text_type_map[short_text_field_name] = text_type
@@ -143,14 +122,17 @@ class ManageTaxonTextsForm(LocalizeableForm):
                                         required=False, label=short_text_field_label, validators=[json_compatible])
                 short_text_field.taxon_text_type = text_type
                 short_text_field.is_short_version = True
-                short_text_field.is_last = False
                 short_text_field.taxon_text = None
+                short_text_field.category = None
 
                 self.fields[short_text_field_name] = short_text_field
                 self.localizeable_fields.append(short_text_field_name)
                 self.fields[short_text_field_name].language = self.language
                 self.layoutable_simple_fields.append(short_text_field_name)
                 
+                if field_index == 1:
+                    short_text_field.category = category
+                
 
                 if settings.APP_KIT_ENABLE_TAXON_PROFILES_LONG_TEXTS == True:
                     long_text_field_name = self.get_long_text_form_field_name(text_type)
@@ -162,19 +144,12 @@ class ManageTaxonTextsForm(LocalizeableForm):
                                             required=False, label=long_text_field_label, validators=[json_compatible])
                     long_text_field.taxon_text_type = text_type
                     long_text_field.is_short_version = False
-                    long_text_field.is_last = False
 
                     self.fields[long_text_field_name] = long_text_field
                     self.localizeable_fields.append(long_text_field_name)
                     self.fields[long_text_field_name].language = self.language
                     self.layoutable_simple_fields.append(long_text_field_name)
-                    
-                if field_index == len(types):
-                    if settings.APP_KIT_ENABLE_TAXON_PROFILES_LONG_TEXTS == True:
-                        long_text_field.is_last = True
-                    else:
-                        short_text_field.is_last = True
-
+                
                 if taxon_profile:
                     content = TaxonText.objects.filter(taxon_text_type=text_type,
                                     taxon_profile=taxon_profile).first()
@@ -185,7 +160,7 @@ class ManageTaxonTextsForm(LocalizeableForm):
                         if settings.APP_KIT_ENABLE_TAXON_PROFILES_LONG_TEXTS == True:
                             long_text_field.initial = content.long_text
                             long_text_field.taxon_text = content
-    
+            
     
     def get_long_text_form_field_name(self, text_type):
 

app_kit/features/taxon_profiles/models.py

@@ -87,51 +87,44 @@ class TaxonProfiles(GenericContent):
     def get_primary_localization(self, meta_app=None):
         locale = super().get_primary_localization(meta_app)
 
-        taxon_query = TaxonProfile.objects.filter(taxon_profiles=self)
-        taxa = LazyTaxonList(queryset=taxon_query)
-        for lazy_taxon in taxa:
-
-            taxon_query = {
-                'taxon_source' : lazy_taxon.taxon_source,
-                'taxon_latname' : lazy_taxon.taxon_latname,
-                'taxon_author' : lazy_taxon.taxon_author,
-            }
-
-            taxon_profile = TaxonProfile.objects.filter(taxon_profiles=self, **taxon_query).first()
-
-            if taxon_profile:
+        all_taxon_profiles = TaxonProfile.objects.filter(taxon_profiles=self)
+        for taxon_profile in all_taxon_profiles:
+            
+            if taxon_profile.publication_status == 'draft':
+                continue
                 
-                if taxon_profile.morphotype:
-                    locale[taxon_profile.morphotype] = taxon_profile.morphotype
+            if taxon_profile.morphotype:
+                locale[taxon_profile.morphotype] = taxon_profile.morphotype
 
-                for text in taxon_profile.texts():
+            for text in taxon_profile.texts():
 
-                    # text_type_key = 'taxon_text_{0}'.format(text.taxon_text_type.id)
-                    # short: use name as key (-> no duplicates in translation matrix)
-                    text_type_key = text.taxon_text_type.text_type
-                    locale[text_type_key] = text.taxon_text_type.text_type
-                    
-                    # text.text is a bad key, because if text.text changes, the translation is gone
-                    # text.text are long texts, so use a different key which survives text changes
-                    # locale[text.text] = text.text
+                # text_type_key = 'taxon_text_{0}'.format(text.taxon_text_type.id)
+                # short: use name as key (-> no duplicates in translation matrix)
+                text_type_key = text.taxon_text_type.text_type
+                locale[text_type_key] = text.taxon_text_type.text_type
+                
+                # text.text is a bad key, because if text.text changes, the translation is gone
+                # text.text are long texts, so use a different key which survives text changes
+                # locale[text.text] = text.text
 
-                    short_text_key = self.get_short_text_key(text)
+                short_text_key = self.get_short_text_key(text)
 
-                    if text.text:
-                        locale[short_text_key] = text.text
+                if text.text:
+                    locale[short_text_key] = text.text
 
-                    long_text_key = self.get_long_text_key(text)
+                long_text_key = self.get_long_text_key(text)
 
-                    if text.long_text:
-                        locale[long_text_key] = text.long_text
+                if text.long_text:
+                    locale[long_text_key] = text.long_text
 
-                content_images_primary_localization = taxon_profile.get_content_images_primary_localization()
-                locale.update(content_images_primary_localization)
+            content_images_primary_localization = taxon_profile.get_content_images_primary_localization()
+            locale.update(content_images_primary_localization)
+            
+            short_profile = taxon_profile.short_profile
+            if short_profile:
+                locale[short_profile] = short_profile
                 
-                short_profile = taxon_profile.short_profile
-                if short_profile:
-                    locale[short_profile] = short_profile
-        
+    
         navigation = TaxonProfilesNavigation.objects.filter(taxon_profiles=self).first()
         
         if navigation:

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/create_taxon_profile.html

@@ -32,7 +32,7 @@
 		<script>
 			var modal = $("#Modal");
 			modal.modal("hide");
-			window.location = "{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon.taxon_source taxon.name_uuid %}";
+			window.location = "{% url 'manage_taxon_profile' meta_app.id taxon_profile.id %}";
 		</script>
 	{% endif %}
 {% endblock %}

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_form.html

@@ -1,70 +1,51 @@
 {% load i18n static localcosmos_tags %}
 {% if text_types %}
-<form id="taxon-text-types-form" method="POST" action="{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon.taxon_source taxon.name_uuid %}">{% csrf_token %}
+<form id="taxon-text-types-form" method="POST" action="{% url 'manage_taxon_profile' meta_app.id taxon_profile.id %}"
+>{% csrf_token %}
 	<div id="text-types-form-fields">
 		{% for field in form %}
-			{% if field.field.is_category_field %}
-				{% if field.field.is_first_category %}
-					<div id="order-ctype-{{ field.field.category|ctype_id }}-container" class="object-order-flex mb-3">
-				{% endif %}
-				<div id="order-ctype-{{ text_type_content_type.id }}{% if field.field.category %}-{{ field.field.category.id }}{% endif %}-container" {% if field.field.category %}data-object-id="{{ field.field.category.id }}"{% endif %} class="text-type-category-container">
+			{% if field.field.category %}
+				<h2>
+					{{ field.field.category }}
+				</h2>
 			{% endif %}
-					<div {% if field.name in form.text_type_map %}id="ctype-{{ field.field.taxon_text_type|ctype_id }}-{{ field.field.taxon_text_type.id }}" data-object-id="{{ field.field.taxon_text_type.id }}" {% endif %} class="row">
-						<div class="col-12">
-							{% if field.is_hidden %}
-								{% if field.field.category %}
-									<h2>
-										{{ field.field.category }}
-									</h2>
+			<div class="row">
+				<div class="col-12">
 
-									{% if not field.field.text_type_count %}
-										{% if taxon_profile.taxon_text_set %}
-											<div class="alert alert-info">{% trans 'The selected Text Set does not include any text types for this category.' %}</div>
-										{% else %}
-											<div class="alert alert-info">{% trans 'No text types for this this category yet.' %}</div>
-										{% endif %}
-									{% endif %}
-								{% else %}
+					{% if field.is_hidden %}
+						{{ field }}
+					{% else %}
+						<div class="form-group {% if field.errors %}has-error{% endif %}">
+
+							<h4>
+								{{ field.label }}
+								{% if field.field.taxon_text_type %}
+									{% if show_text_length_badges %}{% if field.field.is_short_version %}<span class="badge badge-info">{% trans 'short version' %}</span>{% else %}<span class="badge badge-primary">{% trans 'long version' %}</span>{% endif %} {% endif %}
 								{% endif %}
-								{{ field }}
-							{% else %}
-								<div class="form-group {% if field.errors %}has-error{% endif %}">
+							</h4>
 
-									<h4>
-										{{ field.label }}
-										{% if field.field.taxon_text_type %}
-											{% if show_text_length_badges %}{% if field.field.is_short_version %}<span class="badge badge-info">{% trans 'short version' %}</span>{% else %}<span class="badge badge-primary">{% trans 'long version' %}</span>{% endif %} {% endif %}
-										{% endif %}
-									</h4>
+							{% if field.field.language %}
+								<img src="{% static 'localcosmos_server/images/countries/' %}{{ field.field.language }}.gif" /> {{ field.field.language }}
+							{% endif %}
 
-									{% if field.field.language %}
-										<img src="{% static 'localcosmos_server/images/countries/' %}{{ field.field.language }}.gif" /> {{ field.field.language }}
-									{% endif %}
+							{{ field }}
+							{% if field.help_text %}
+								<small class="form-text text-muted">{{ field.help_text }}</small>
+							{% endif %}
+						</div>
 
-									{{ field }}
-									{% if field.help_text %}
-										<small class="form-text text-muted">{{ field.help_text }}</small>
-									{% endif %}
+						{% if field.field.taxon_text and field.field.is_short_version %}
+							{% with content_instance=field.field.taxon_text %}
+								<div id="content-images-list-{{ content_instance|ctype_id }}-{{ content_instance.id }}" class="taxon-text-images-container">
+									{% include 'app_kit/ajax/content_images_list.html' %}
 								</div>
-
-								{% if field.field.taxon_text and field.field.is_short_version %}
-									{% with content_instance=field.field.taxon_text %}
-										<div id="content-images-list-{{ content_instance|ctype_id }}-{{ content_instance.id }}" class="taxon-text-images-container">
-											{% include 'app_kit/ajax/content_images_list.html' %}
-										</div>
-									{% endwith %}
-								{% endif %}
-								<br><br>
-							{% endif %}	
-						</div>
-					</div>
-			{% if field.field.is_last %}
+							{% endwith %}
+						{% endif %}
+						<br><br>
+					{% endif %}
 				</div>
-			{% endif %}
+			</div>
 		{% endfor %}
-		{% if form.has_categories %}
-			<!--</div>-->
-		{% endif %}
 	</div>
 
 	<div class="row">

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_morphotype.html

@@ -23,7 +23,8 @@
 	{% if success %}
         <script>
             {% if created %}
-                window.location.href = "{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon_profile.taxon.taxon_source taxon_profile.taxon.name_uuid taxon_profile.morphotype %}";
+                // taxon_profile is the created morphotype profile
+                window.location.href = "{% url 'manage_taxon_profile' meta_app.id taxon_profile.id %}";
             {% else %}
                 // Reload the page to show the updated morphotype
                 $('#Modal').modal('hide');

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/nature_guide_taxonlist.html

@@ -7,7 +7,7 @@
 				{% if meta_node.taxon %}
 					{% get_taxon_profile meta_app meta_node.taxon as profile %}
 					{% if profile %}
-						<a href="{% url 'manage_taxon_profile' meta_app.id generic_content.id profile.taxon_source profile.name_uuid %}">
+						<a href="{% url 'manage_taxon_profile' meta_app.id profile.id %}">
 							{{ meta_node.name }} <i>{{ meta_node.taxon_latname }} {{ meta_node.taxon_author }}</i>
 						</a>
 						{% if profile.publication_status == 'draft' %}
@@ -23,7 +23,7 @@
 					{% get_nature_guide_taxon meta_node nature_guide as taxon %}
 					{% get_taxon_profile meta_app taxon as non_taxon_profile %}
 					{% if non_taxon_profile %}
-						<a href="{% url 'manage_taxon_profile' meta_app.id generic_content.id non_taxon_profile.taxon_source non_taxon_profile.name_uuid %}">
+						<a href="{% url 'manage_taxon_profile' meta_app.id non_taxon_profile.id %}">
 							{{ meta_node.name }}
 						</a>
 						{% if non_taxon_profile.publication_status == 'draft' %}

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/non_nature_guide_taxonlist.html

@@ -3,7 +3,7 @@
 <ul>
     {% for profile in non_nature_guide_taxon_profiles %}
         <li>
-            <a href="{% url 'manage_taxon_profile' meta_app.id generic_content.id profile.taxon_source profile.name_uuid %}">
+            <a href="{% url 'manage_taxon_profile' meta_app.id profile.id %}">
                 <i>{{ profile.taxon_latname }} {{ profile.taxon_author }}</i>
             </a>
             {% if profile.publication_status == 'draft' %}

app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_profile.html

@@ -92,7 +92,7 @@
 							</div>
 							{% for duplicate in possible_duplicates %}
 								<i>
-									<a href="{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id duplicate.taxon_source duplicate.name_uuid %}">{{ duplicate.taxon_latname }} {{ duplicate.taxon_author }}</a>
+									<a href="{% url 'manage_taxon_profile' meta_app.id duplicate.id %}">{{ duplicate.taxon_latname }} {{ duplicate.taxon_author }}</a>
 								</i>
 							{% endfor %}
 						</div>
@@ -111,10 +111,10 @@
 				</div>
 			</div>
 		{% endif %}
-		{% if taxon_profile.morphotype %}
+		{% if taxon_profile.morphotype and taxon_profile.parent_profile %}
 			<div class="row">
 				<div class="col-12">
-					{% trans 'This is a morphotype of:' %} <a href="{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon.taxon_source taxon.name_uuid %}">
+					{% trans 'This is a morphotype of:' %} <a href="{% url 'manage_taxon_profile' meta_app.id taxon_profile.parent_profile.id %}">
 						{{ taxon }}
 					</a>
 				</div>
@@ -131,7 +131,7 @@
 								{% if taxon_profile.morphotype_profiles %}
 									{% for morphotype in taxon_profile.morphotype_profiles %}
 										<div>
-											<a href="{% url 'manage_taxon_profile' meta_app.id taxon_profiles.id taxon_profile.taxon.taxon_source taxon_profile.taxon.name_uuid morphotype.morphotype %}">
+											<a href="{% url 'manage_taxon_profile' meta_app.id morphotype.id %}">
 												{{ morphotype.morphotype }}
 											</a>
 										</div>

app_kit/features/taxon_profiles/urls.py

@@ -10,6 +10,9 @@ urlpatterns = [
          views.CreateTaxonProfile.as_view(), name='create_taxon_profile'),
     path('manage-taxon-profile/<int:meta_app_id>/<int:taxon_profiles_id>/<str:taxon_source>/<uuid:name_uuid>/',
          views.ManageTaxonProfile.as_view(), name='manage_taxon_profile'),
+    # this should be the future wherever possible, as it is more robust (does not rely on taxon_source and name_uuid to be unchanged)
+    path('manage-taxon-profile/<int:meta_app_id>/<int:taxon_profile_id>/',
+         views.ManageTaxonProfile.as_view(), name='manage_taxon_profile'),
     path('delete-taxon-profile/<int:meta_app_id>/<int:pk>/',
         views.DeleteTaxonProfile.as_view(), name='delete_taxon_profile'),
     # morphotypes

app_kit/features/taxon_profiles/views.py

@@ -298,16 +298,22 @@ class ManageTaxonProfile(CreateTaxonProfileMixin, MetaAppFormLanguageMixin, Form
 
     def set_taxon(self, request, **kwargs):
         
-        self.taxon_profiles =  TaxonProfiles.objects.get(pk=kwargs['taxon_profiles_id'])
-
-        taxon_source = kwargs['taxon_source']
-        name_uuid = kwargs['name_uuid']
+        if 'taxon_profile_id' in kwargs:
+            self.taxon_profile = TaxonProfile.objects.get(pk=kwargs['taxon_profile_id'])
+            self.taxon_profiles = self.taxon_profile.taxon_profiles
+            
+        else:
         
-        morphotype = kwargs.get('morphotype', None)
+            self.taxon_profiles =  TaxonProfiles.objects.get(pk=kwargs['taxon_profiles_id'])
 
-        self.taxon_profile = TaxonProfile.objects.get(taxon_profiles=self.taxon_profiles,
-                                                taxon_source=taxon_source, name_uuid=name_uuid,
-                                                morphotype=morphotype)
+            taxon_source = kwargs['taxon_source']
+            name_uuid = kwargs['name_uuid']
+            
+            morphotype = kwargs.get('morphotype', None)
+
+            self.taxon_profile = TaxonProfile.objects.get(taxon_profiles=self.taxon_profiles,
+                                                    taxon_source=taxon_source, name_uuid=name_uuid,
+                                                    morphotype=morphotype)
 
         self.taxon = LazyTaxon(instance=self.taxon_profile)
 
@@ -744,44 +750,50 @@ class CollectTaxonImages(MetaAppFormLanguageMixin, TemplateView):
         return images
 
     def get_taxon_images(self, exclude=[]):
-        images = ContentImage.objects.filter(image_store__taxon_source=self.taxon.taxon_source,
-                            image_store__taxon_latname=self.taxon.taxon_latname).exclude(pk__in=exclude)
+        
+        images = []
+        
+        if not self.taxon_profile.morphotype:
+            images = ContentImage.objects.filter(image_store__taxon_source=self.taxon.taxon_source,
+                                image_store__taxon_latname=self.taxon.taxon_latname).exclude(pk__in=exclude)
 
         return images
     
     # images can be on MetNode or NatureGuidesTaxonTree
     def get_nature_guide_images(self, exclude=[]):
         
-        meta_nodes = MetaNode.objects.filter(taxon_source=self.taxon.taxon_source, 
-            taxon_latname=self.taxon.taxon_latname, taxon_author=self.taxon.taxon_author, morphotype=self.morphotype)
-
         nature_guide_images = []
+        
+        if not self.taxon_profile.morphotype:
+        
+            meta_nodes = MetaNode.objects.filter(taxon_source=self.taxon.taxon_source, 
+                taxon_latname=self.taxon.taxon_latname, taxon_author=self.taxon.taxon_author, morphotype=self.morphotype)
 
-        if meta_nodes:
+            if meta_nodes:
 
-            meta_node_ids = meta_nodes.values_list('id', flat=True)
+                meta_node_ids = meta_nodes.values_list('id', flat=True)
 
-            meta_node_content_type = ContentType.objects.get_for_model(MetaNode)
-            meta_node_images = ContentImage.objects.filter(content_type=meta_node_content_type,
-                                            object_id__in=meta_node_ids).exclude(pk__in=exclude)
-            
-            exclude += list(meta_node_images.values_list('id', flat=True))
-            nature_guide_images += list(meta_node_images)
+                meta_node_content_type = ContentType.objects.get_for_model(MetaNode)
+                meta_node_images = ContentImage.objects.filter(content_type=meta_node_content_type,
+                                                object_id__in=meta_node_ids).exclude(pk__in=exclude)
+                
+                exclude += list(meta_node_images.values_list('id', flat=True))
+                nature_guide_images += list(meta_node_images)
 
-        
-        nodes = NatureGuidesTaxonTree.objects.filter(meta_node__taxon_source=self.taxon.taxon_source,
-            meta_node__taxon_latname=self.taxon.taxon_latname,
-            meta_node__taxon_author=self.taxon.taxon_author)
+            
+            nodes = NatureGuidesTaxonTree.objects.filter(meta_node__taxon_source=self.taxon.taxon_source,
+                meta_node__taxon_latname=self.taxon.taxon_latname,
+                meta_node__taxon_author=self.taxon.taxon_author)
 
-        if nodes:
+            if nodes:
 
-            node_ids = nodes.values_list('id', flat=True)
+                node_ids = nodes.values_list('id', flat=True)
 
-            node_content_type = ContentType.objects.get_for_model(NatureGuidesTaxonTree)
-            node_images = ContentImage.objects.filter(content_type=node_content_type,
-                                            object_id__in=node_ids).exclude(pk__in=exclude)
-            
-            nature_guide_images += list(node_images)
+                node_content_type = ContentType.objects.get_for_model(NatureGuidesTaxonTree)
+                node_images = ContentImage.objects.filter(content_type=node_content_type,
+                                                object_id__in=node_ids).exclude(pk__in=exclude)
+                
+                nature_guide_images += list(node_images)
             
 
         return nature_guide_images

{localcosmos_app_kit-0.9.18.dist-info → localcosmos_app_kit-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcosmos_app_kit
-Version: 0.9.18
+Version: 0.10.0
 Summary: LocalCosmos App Kit. Web Portal to build Android and iOS apps
 Home-page: https://github.com/localcosmos/app-kit
 Author: Thomas Uher

{localcosmos_app_kit-0.9.18.dist-info → localcosmos_app_kit-0.10.0.dist-info}/RECORD

@@ -37,10 +37,10 @@ app_kit/app_kit_api/tests/__pycache__/test_serializers.cpython-311.pyc,sha256=Xv
 app_kit/app_kit_api/tests/__pycache__/test_views.cpython-311.pyc,sha256=jzyuIXHjnoubiVjdoa5h2YxGSTAomhTxhyxfZBqVf1o,10161
 app_kit/appbuilder/AppBuilderBase.py,sha256=mDwmMd0Fdl-wedTYWEK8AcHfiAhvjxFBGOkLrGavwTs,29160
 app_kit/appbuilder/AppPreviewBuilder.py,sha256=C0oSh_i1Cx4vLW01T0qJeo-MrtqqjD72Hh43k4kG5EI,6845
-app_kit/appbuilder/AppReleaseBuilder.py,sha256=Xh1G8DI5azLLA1_uE-S_4HQDACs2xqxbA87bBGhdBeo,131151
+app_kit/appbuilder/AppReleaseBuilder.py,sha256=up6NEc5l46FdPBWH2iW6XZKMET_s1PEJ4Jq2J0Wiges,134050
 app_kit/appbuilder/ContentImageBuilder.py,sha256=k9YdH2d5oIyfbeoA9H_DaUigc1SQ69WnXFy9e00DdfA,7332
 app_kit/appbuilder/GBIFlib.py,sha256=iGj01hrk0iG-qjEkPM8ez_lNKL_zJedPTS3oUZDd8vg,989
-app_kit/appbuilder/TaxonBuilder.py,sha256=4c9tDVxWoHIXiy3z-hHku2OXceQDJDjrehvm8spXtuE,15983
+app_kit/appbuilder/TaxonBuilder.py,sha256=BQcu1EWn-eGrTZhrbVCDdRsjBQ9nsjpUKaJMIXgbA8A,16390
 app_kit/appbuilder/__init__.py,sha256=PIqSBvR4NFND1zb_KOryk3PFZ5yhiGwaZIZSRSTp1JY,152
 app_kit/appbuilder/precompile_fulltree.py,sha256=Lrf5j0xGY2FgpuuWdUrfef1ZlLs-GntFYpngtZ5pTF0,2005
 app_kit/appbuilder/JSONBuilders/BackboneTaxonomyJSONBuilder.py,sha256=worozLAgqxKJSdBzQ45zlCL3l4BnpZAYX-Dl4SfmwUs,6488
@@ -52,7 +52,7 @@ app_kit/appbuilder/JSONBuilders/GlossaryJSONBuilder.py,sha256=7pITMctTmEVRbyb7Dl
 app_kit/appbuilder/JSONBuilders/JSONBuilder.py,sha256=BssXm7ueXghCmHHmWsnQekQdbE4g0UIIQ59a6k0Bzts,6010
 app_kit/appbuilder/JSONBuilders/MapJSONBuilder.py,sha256=NgP5g_H0sfq5VRkoHdMzkQUGLgUofcwG1R2xe6vUS9U,2792
 app_kit/appbuilder/JSONBuilders/NatureGuideJSONBuilder.py,sha256=LZgyfc0e2xhTB9XES6fgm_vmL-O7VBBXsRdNDapgu5E,25498
-app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py,sha256=XNtRAQ31UPSghcFPUR1-RQLdzDpDxmkITb_paYP4uxQ,34716
+app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py,sha256=tvHz0--awo5Rvsc_nPNGvwbPKLAuNXUh4RX0erZOTZM,36345
 app_kit/appbuilder/JSONBuilders/TemplateContentJSONBuilder.py,sha256=zWF7SNeRosbOi876boXp0tpIYXVs04fKtauK9Fr_DRs,7382
 app_kit/appbuilder/JSONBuilders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app_kit/appbuilder/JSONBuilders/generic_forms_JSON_specification,sha256=dFabBHtkfzJqB2zNSRR2OaIyroYr1nEw_qY6VFZF7dQ,6720
@@ -74,7 +74,7 @@ app_kit/appbuilder/JSONBuilders/__pycache__/NatureGuideJSONBuilder.cpython-311.p
 app_kit/appbuilder/JSONBuilders/__pycache__/NatureGuideJSONBuilder.cpython-313.pyc,sha256=jF5kdrd9eYsIuLJtophN4ptZB67MM1poI4Oao2aY8RU,25376
 app_kit/appbuilder/JSONBuilders/__pycache__/TaxonJSONBuilder.cpython-311.pyc,sha256=nEt3jd6Pf4lb0QnFpU7QPg9bsKa68z0Vh8C85t4CMO0,9663
 app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-311.pyc,sha256=bffiRE-WzCN3s0sz00rFuuu8c0qFL7kRq97XwtuRnoo,22862
-app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-313.pyc,sha256=--E2Ix4-WlvKe_BPIWLnqoNmEnkfWop0ZDn2FWJu1Ew,29536
+app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-313.pyc,sha256=y3XVQ4f5zXWVClaO6vQLNXKklpt7K4ymnix51Xnu5Ok,29288
 app_kit/appbuilder/JSONBuilders/__pycache__/TemplateContentJSONBuilder.cpython-311.pyc,sha256=7fGagTetGK129h057h6dPXMSwggBX03uHOm3_dr3ueE,5932
 app_kit/appbuilder/JSONBuilders/__pycache__/TemplateContentJSONBuilder.cpython-313.pyc,sha256=lXf1kZuOMRWsHmnP1aN7UJIPEfWF-PhiMyyZ9FfY1Tg,6501
 app_kit/appbuilder/JSONBuilders/__pycache__/__init__.cpython-311.pyc,sha256=MxwSyVkGIkNVrjjMZzXCHh9k7_ytM6tzgpNTaCtDNn4,211
@@ -84,13 +84,13 @@ app_kit/appbuilder/__pycache__/AppBuilderBase.cpython-313.pyc,sha256=GTLt_n208ej
 app_kit/appbuilder/__pycache__/AppPreviewBuilder.cpython-311.pyc,sha256=5kKHNjUuOfp31cqB_ZO175x-wGgVVhqX8YkHWSlX--k,8245
 app_kit/appbuilder/__pycache__/AppPreviewBuilder.cpython-313.pyc,sha256=C7-mLN6yGvDrknbBamjKkI9fxjfT3djrdr3-8Fhc7HQ,7526
 app_kit/appbuilder/__pycache__/AppReleaseBuilder.cpython-311.pyc,sha256=ZAHDJfyKvQzTsyFHIjvRjCiCn1dzObCPp6XYWCGHZmI,126739
-app_kit/appbuilder/__pycache__/AppReleaseBuilder.cpython-313.pyc,sha256=8bJrshzvJDUlDowgZ96tnBvNx6h9zh96m12mAekOwCQ,129137
+app_kit/appbuilder/__pycache__/AppReleaseBuilder.cpython-313.pyc,sha256=_88iSOHywr1q1eKR6zJLdemnjwvIrL2kldxx0mZcrT0,131779
 app_kit/appbuilder/__pycache__/ContentImageBuilder.cpython-311.pyc,sha256=EyL2LamJkdU_7O_F0j3vwtTYjInblFSPKmlPLyXvSuE,8920
 app_kit/appbuilder/__pycache__/ContentImageBuilder.cpython-313.pyc,sha256=K6b-GlHYhM0SWlniDyyFfKdK_QF7kHN8yFahn2ETCa8,8737
 app_kit/appbuilder/__pycache__/GBIFlib.cpython-311.pyc,sha256=NNB_AHGQnN0ld82WuJHxGn5RthLO_fGkpVAfAHaDyMU,1945
 app_kit/appbuilder/__pycache__/GBIFlib.cpython-313.pyc,sha256=13SE5Ayqrg8n90KGWbLE7rQ-UPaU2Q0XbY5dQENpXTA,1962
 app_kit/appbuilder/__pycache__/TaxonBuilder.cpython-311.pyc,sha256=7JVnCo4-CVmaX_EIzU05is5ySaqWPA86QBlFM-B4Trw,16273
-app_kit/appbuilder/__pycache__/TaxonBuilder.cpython-313.pyc,sha256=mxUE3vbiXd4R9F3iFOdPIAuZySRhBJ6KIeGllVJp4Uw,16957
+app_kit/appbuilder/__pycache__/TaxonBuilder.cpython-313.pyc,sha256=fNSv6AE_6jLLNiXE4SFVpSHv6_hVkeSUIGmaFJxLkao,17166
 app_kit/appbuilder/__pycache__/__init__.cpython-311.pyc,sha256=KkcyxSIx1hiGZkOwMG8qWGJQ-RPacWMKpfpnP-naNv4,388
 app_kit/appbuilder/__pycache__/__init__.cpython-313.pyc,sha256=iHwg7gUn2XzOOz0SNmIeY6GVMxTcc5NKM3gzSz4pLnA,329
 app_kit/appbuilder/app/frontends/Multiverse/settings.json,sha256=dCcy0ZGor57YhlrPUJVj-IADrF413gBBWFUfletZW6g,2026
@@ -154,7 +154,7 @@ app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/add_taxon_form.html
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_backbone_taxa_form.html,sha256=wVUAExurrDbck2SD9pwL4IWdOx0Z-QHWU9idNbnc5VY,1529
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_backbonetaxonomy.html,sha256=0EehuPUlE6-g7miYOycv_j2aZPqmU-Ykwd_bpC3LdMM,4101
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_fulltree_form.html,sha256=uqw8OL3dGy7_iZzGxgGc3KHNSsGHVBniBx2FQSrM8h0,622
-app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_taxon.html,sha256=vkQjHX7K9OGPB3lrBFnJguWpCXKzbvLmKrnwAPgOG34,1882
+app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_taxon.html,sha256=Rsn0XHwq4n_Zk4iPVi_MKb3sB6z6L2KeaZPP82tZi4Y,1846
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/remove_backbone_taxon.html,sha256=-9t83d771KmyoeENWqvxrxyoI7zOK5-sHL_rLdHxsP0,1206
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/swap_taxon.html,sha256=6soId42pD0s-vxCSNE8RNNotSfSWOINmMk3Eyo9hlMM,7469
 app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/taxon_relationships.html,sha256=jBFcbS1CJnd0b9IqSMGcfDFR-tmHygOs4wSBfFekPEo,5503
@@ -398,10 +398,10 @@ app_kit/features/nature_guides/tests/__pycache__/test_views.cpython-311.pyc,sha2
 app_kit/features/taxon_profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app_kit/features/taxon_profiles/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 app_kit/features/taxon_profiles/apps.py,sha256=c0nynglV50B8qvXTnu7v6LZHT6N5nOTayOasKICAAJE,119
-app_kit/features/taxon_profiles/forms.py,sha256=T5mU0QGhG_fSNppzuzTxjxb078VA4IckOPOaP7nM5fE,16998
-app_kit/features/taxon_profiles/models.py,sha256=xYDHT_KI_xatFUwYYnkogXeqd70kr9Dp8YVum8hzvRw,24214
-app_kit/features/taxon_profiles/urls.py,sha256=wamGUfN5cpCvYEfNnTTbdqBt1GeFQbybmzsG7_KtpvA,10814
-app_kit/features/taxon_profiles/views.py,sha256=WCA2C8D6eyghFg42CRBQZlyvcy_UWf2iDcZPwOcRzSc,61245
+app_kit/features/taxon_profiles/forms.py,sha256=jBvYFgKAG9_gpCG3dfE97KQTnTiKjTIOQenmeXVE62g,16131
+app_kit/features/taxon_profiles/models.py,sha256=kllsA7VTgD5a8KVyHAUV0udMcv7Keg5hd5x1LcrmR3I,23855
+app_kit/features/taxon_profiles/urls.py,sha256=IhJOF7HIPOw-VanBzJtSanKOdAgWL1vKy9evcHD3Bzw,11098
+app_kit/features/taxon_profiles/views.py,sha256=gIZTKT7bdnHOBhNgLqpLsTtkAjARbMPDnHC4Y1lXoBQ,61750
 app_kit/features/taxon_profiles/zip_import.py,sha256=aYFEtaMjn5Qebj0eaOeM-WVdvMUDymH4wUOnhAItN9I,29883
 app_kit/features/taxon_profiles/migrations/0001_initial.py,sha256=aknHwoaZMBwDWMnp7dftXToVGuyN4f9xy3epQSqGkxQ,3659
 app_kit/features/taxon_profiles/migrations/0002_taxontext_long_text.py,sha256=FN2GAdO4paIgX8FpREoLk7cihlHRRaehVY7_Ve0K97w,383
@@ -418,7 +418,7 @@ app_kit/features/taxon_profiles/migrations/0012_taxonprofile_updated_at.py,sha25
 app_kit/features/taxon_profiles/migrations/0013_alter_taxonprofile_options_and_more.py,sha256=03fp39qqKjBJOiUspog7BzgxVg80lZJ8vq8dZhq8K98,596
 app_kit/features/taxon_profiles/migrations/0014_alter_taxonprofile_unique_together_and_more.py,sha256=wPO0TfoU_I9_BBLOSe3gvzMzEeGpxP5exnwuGT_ngUU,2501
 app_kit/features/taxon_profiles/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_profile.html,sha256=9uqOz0oQuA8Yxyg1yTSZs0RCWpjASOS6mIZgJm6uJFQ,11184
+app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_profile.html,sha256=i04Bvrb5fKgxnD4oCUaqTcTf2D3RsQElmg7LHUe8HEE,11059
 app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_profiles.html,sha256=NJGnmoa5da40e-hUpZAG2V-UZGqf_oxAd8bIABfuaKw,9304
 app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_texts.html,sha256=q1Do_NKTwkQ8sHWY4Zx4CXaWbpfFBGxn6_8Uc3N4EVA,1353
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/backbone_taxa_taxonlist.html,sha256=6zEHqwPnU0bJJmyQqkXxWw90D0IQ1WPtm4sCCKXFJMQ,656
@@ -427,7 +427,7 @@ app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/change_navigation_
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/change_taxon_profile_publication_status.html,sha256=zuDHrJc77sAVLCmFmhvUMyJSYVQu8zQT_RC0PwavTiI,596
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/collected_taxon_images.html,sha256=a6HQJ6p4QMSpDqYraentxFyGmIxs-5uypFbWIyoR4q8,3654
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/collected_taxon_traits.html,sha256=PkA7sGNPBFQ_t1Pb4X1avCd_n9SVFKedN0BIsYyB0Eg,2470
-app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/create_taxon_profile.html,sha256=TylM_rq_aARbxzBgLZ8iGO6BNMFiGCue9-4saUZdS4c,1092
+app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/create_taxon_profile.html,sha256=jbyin1419LNIbBltUmvN4S02K9jq2vgdJwGz3Dh8dSs,1056
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_all_manually_added_images.html,sha256=_zOaLGeVD3AKPmIzwRTr-eHi0Lo38dOTsSzYI-Oz_rE,1022
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_navigation_entry.html,sha256=kCNgH9qiAvF5Y3XP6UPA-XZeFb0Uw2CZakkYY-JjZD0,226
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_navigation_entry_taxon.html,sha256=xn3CFCzn1qZS5tM76GeQn4-2_WL4zLo5OxUTAD47XiQ,410
@@ -438,19 +438,19 @@ app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_taxon_text_
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_taxon_text_type_category.html,sha256=mIgqNz2dcZyl-6U2bClztlERrSCzct5RhOnY_KB51tA,381
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_navigation_entry.html,sha256=a_Cydkty0fWKIOzcnXOa0US-eLrjKI_y8LaI4unxeC0,2497
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_navigation_image.html,sha256=9uAZLbs5Rs4Xew3ua-0BOT4MzLXjW25XjgO73vPJxP8,872
-app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_form.html,sha256=RZ-7jxCk-gxW7Ozzm_5sX7SlhG9N-LL80yYAq1iB0QY,4432
+app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_form.html,sha256=VbfbX5xrfhzjBealfy49tbzZf4Z0wFXc7UvujzuMvnw,3089
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_image.html,sha256=TORQADZVRluI4VN3D_0cKJsKhEJu7y8JgOR-sDv6INU,1141
-app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_morphotype.html,sha256=uB_yzjW_cKFO32dqwaKtSUw-jLRfrzl2Aerf7cP66Fo,1071
+app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_morphotype.html,sha256=eVyORlAKHmHjB3crC1uTusXhmYOz72Fo2Hd3fwT00nA,1049
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_text_set.html,sha256=E98YJtky7fBZxPiP_gkT6LxaRHtN5BDPgc0ow3mU93I,1148
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_text_type.html,sha256=XFkHIQsxGFndUCMK5U-b0E48Fibbod2mlYw51DUcbWk,1404
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_text_type_category.html,sha256=5aS1gI4kXOms7TWBiGIOp37Z56TzC4QyhHBuoJlkBCs,1391
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/move_image_to_section.html,sha256=IVpYDx7oLL16auz9D5rSXA6PMChPLhT6IsmQsuYkELg,585
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/move_navigation_entry.html,sha256=mZ-e8N8j-XhFaueIOpJSGv8knL2iX20i_FvQSeqS5uE,2158
-app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/nature_guide_taxonlist.html,sha256=tFbBXh60iJPOB7hWDxSr83yvfjL1DF8MfHuVGle3iZQ,2015
+app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/nature_guide_taxonlist.html,sha256=dXtTcymXITUEoBsGe2XoTSbifyacPLjD0NX539cVyRU,1911
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/navigation_entry_taxa.html,sha256=6UeTMqrtUCU7WEzZBK_yT9HquxxFWONRekiwoj7jh5U,2063
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/navigation_entry_taxon_profiles.html,sha256=m3IaC1yd4lvpRTV8CnSOM60pFxZukIndmCw_Yv-Yorw,910
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/navigation_entry_taxon_profiles_list.html,sha256=DrSBBxOOMSUYBZj7-XCPvmDkWB_Y8587AVlrCLPVrxE,431
-app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/non_nature_guide_taxonlist.html,sha256=dGz2NdCx38ACm3lixNHsOJsedImGs7D2oLfds6iMq1U,629
+app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/non_nature_guide_taxonlist.html,sha256=4sLthyIACNopPz7ev1A4866M3nxRpkrhZEgR3eT3Smo,582
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/set_taxon_text_set_for_taxon_profile.html,sha256=M92q0Qh2RB-Lxi717_EctdZbrp7v7kd1BMdrclkaQ8Q,611
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/taxon_profiles_navigation.html,sha256=a098AWlYiJae0V23YMwXx1JsPW0D_4DI1ASMn4E9Sx4,980
 app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/taxon_profiles_navigation_level.html,sha256=GY0KFR7BPiLsiMIVy8xRukZpbsQ6q7RBE3QiaR7506s,6204
@@ -1903,7 +1903,6 @@ app_kit/tests/TESTS_ROOT/images/app-background.jpg,sha256=bmW6cudSfmcRqGSK9P2Sc5
 app_kit/tests/TESTS_ROOT/images/localcosmos-logo.svg,sha256=4-MHj0FjED9eTgmUHnAP-DHCQRqc557HH9akHaoQxs0,409549
 app_kit/tests/TESTS_ROOT/images/test-image-2560-1440.jpg,sha256=BOP-1ZlA9wq-E1sUkOpyqUowpFCdSoF965oKgajjSq0,156278
 app_kit/tests/TESTS_ROOT/ipa_for_tests/TestApp.ipa,sha256=YdGWqMepeBwvpkch3DSVMlnNkf8RuGwENWuwHtoY1Do,78900
-app_kit/tests/TESTS_ROOT/media_for_tests/test/imagestore/31/a6a11b61d65ee19c4c22caa0682288ff.jpg,sha256=dXT6yUqaMJ_91rwQMHT22VjDGb69KRCmm4eboxjtnxM,49349
 app_kit/tests/TESTS_ROOT/templates/neobiota.html,sha256=3ag2VGCuaZ-FoAu25GMUb3s4qMsY7AyhNoDf7CSZJ_w,147
 app_kit/tests/TESTS_ROOT/xlsx_for_testing/BackboneTaxonomy/invalid/Backbone taxonomy.xlsx,sha256=cMkmCtGBR1wwhpDSbjrscNSvLMGnb6YbaliQqws-l7M,8121
 app_kit/tests/TESTS_ROOT/xlsx_for_testing/BackboneTaxonomy/invalid_content_type/Backbone taxonomy.xlsx,sha256=aYRrPI-UABxQUZF-bWvbrD_31ZQgEijdKCzBGOXzGRk,7996
@@ -1939,8 +1938,8 @@ app_kit/tests/__pycache__/test_models.cpython-313.pyc,sha256=Lmv3BfjLs5Fg-olJeMl
 app_kit/tests/__pycache__/test_utils.cpython-313.pyc,sha256=GX3REqZygi2eO_A2F2_KtYi7hg54X5QPtCTCGWuxGpM,14054
 app_kit/tests/__pycache__/test_views.cpython-311.pyc,sha256=NDJR40TcMm-bXXC-wV7OgH1sGR3N7psSWYiUirkkrjU,133242
 app_kit/tests/__pycache__/test_views.cpython-313.pyc,sha256=q851UqIZFCCTfQb1lF4SVxV1j_Vu1hJdOlpckmrGX28,125363
-localcosmos_app_kit-0.9.18.dist-info/licenses/LICENCE,sha256=VnxALPSxXoU59rlNeRdJtwS_nU79IFpVWsZZCQUM4Mw,1086
-localcosmos_app_kit-0.9.18.dist-info/METADATA,sha256=wC25Ke7ekb_Rf0l-tcIN2Ih3__GSe64Z0SNNQwGQVSg,1388
-localcosmos_app_kit-0.9.18.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-localcosmos_app_kit-0.9.18.dist-info/top_level.txt,sha256=F6H4pEBkCvUR_iwQHIy4K1iby-jzfWg3CTym5XJKeys,8
-localcosmos_app_kit-0.9.18.dist-info/RECORD,,
+localcosmos_app_kit-0.10.0.dist-info/licenses/LICENCE,sha256=VnxALPSxXoU59rlNeRdJtwS_nU79IFpVWsZZCQUM4Mw,1086
+localcosmos_app_kit-0.10.0.dist-info/METADATA,sha256=pVHi86lhY2n4lU4kKq5TLikiIHOxHWFiEerAaFnNzqw,1388
+localcosmos_app_kit-0.10.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+localcosmos_app_kit-0.10.0.dist-info/top_level.txt,sha256=F6H4pEBkCvUR_iwQHIy4K1iby-jzfWg3CTym5XJKeys,8
+localcosmos_app_kit-0.10.0.dist-info/RECORD,,