[metasearch] Improve empty field handling

qgis · Jul 18, 2024 · 8b8a27b · 8b8a27b
1 parent c2660e2
commit 8b8a27b
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/python/plugins/MetaSearch/resources/templates/record_metadata_dc.html b/python/plugins/MetaSearch/resources/templates/record_metadata_dc.html
@@ -23,51 +23,65 @@ <h3>{{ gettext('Record Metadata') }} (<a href="{{ obj.url }}">{{ gettext('View X
             <table>
                 <tr>
                     <td>{{ gettext('Identifier') }}</td>
-                    <td>{{ obj.identifier }}</td>
+                    <td>{{ obj.identifier if obj.identifier not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Title') }}</td>
-                    <td>{{ obj.title }}</td>
+                    <td>{{ obj.title if obj.title not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Abstract') }}</td>
-                    <td>{{ obj.abstract }}</td>
+                    <td>{{ obj.abstract if obj.abstract not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Subjects') }}</td>
-                    <td>{{ obj.subjects|join(',') }}</td>
+                    <td>{% set filteredSubjects = obj.subjects | select('ne', None) | select('ne', 'None') | select('ne', '') | list %}
+                        {{ filteredSubjects | join(',') if filteredSubjects else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Creator') }}</td>
-                    <td>{{ obj.creator }}</td>
+                    <td>{{ obj.creator if obj.creator not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Contributor') }}</td>
-                    <td>{{ obj.contributor}}</td>
+                    <td>{{ obj.contributor if obj.contributor not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Publisher') }}</td>
-                    <td>{{ obj.publisher}}</td>
+                    <td>{{ obj.publisher if obj.publisher not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Modified') }}</td>
-                    <td>{{ obj.modified }}</td>
+                    <td>{{ obj.modified if obj.modified not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Language') }}</td>
-                    <td>{{ obj.language }}</td>
+                    <td>{{ obj.language if obj.language not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Format') }}</td>
-                    <td>{{ obj.format }}</td>
+                    <td>
+                        {{ obj.format if obj.format not in [None, 'None', '']
+                        else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Rights') }}</td>
-                    <td>{{ obj.rights|join(',') }}</td>
+                    <td>{% set filteredRights = obj.rights | select('ne', None) | select('ne', 'None') | select('ne', '') | list %}
+                        {{ filteredRights | join(',') if filteredRights else gettext('None') }}</td>
                 </tr>
                 <tr>
                     <td>{{ gettext('Bounding Box') }}</td>
-                    <td>{{ [obj.bbox.minx, obj.bbox.miny, obj.bbox.maxx, obj.bbox.maxy]|join(',') }}</td>
+                    <td>{{ [obj.bbox.minx, obj.bbox.miny, obj.bbox.maxx, obj.bbox.maxy] | join(',')
+                           if obj.bbox not in [None, 'None', '']
+                           else gettext('None') }}</td>
                 </tr>
             </table>
         </section>