Better parsing and displaying of gastronomy.

diff --git a/bots/sledrun_wikitext_to_json.py b/bots/sledrun_wikitext_to_json.py
index 39062968b285a1b8e5f14424893e04f4b026fe25..0ba0e1ea4e07d0fb45b6c756c7753700ed7aaa6b 100644 (file)
--- a/bots/sledrun_wikitext_to_json.py
+++ b/bots/sledrun_wikitext_to_json.py
@@ -359,11 +359,17 @@ class SledrunWikiTextToJsonBot(
                                 g['weblink'] = external_link_to_json(ext_link)
                             remaining = str(Wikicode(n for n in wiki.nodes
                                                      if isinstance(n, (Text, Tag)) and str(n).strip() != '*')).strip()
                                 g['weblink'] = external_link_to_json(ext_link)
                             remaining = str(Wikicode(n for n in wiki.nodes
                                                      if isinstance(n, (Text, Tag)) and str(n).strip() != '*')).strip()

-                            match = re.match(r'\((.+)\)', remaining)
+                            match = re.match(r'(.*)\((.+)\)', remaining)

                             if match:
                             if match:

-                                remaining = match.group(1)
-                            if len(remaining) > 0:
-                                g['note'] = remaining
+                                name, note = match.group(1)
+                                name = name.strip()
+                                note = note.strip()
+                                if len(name) > 0:
+                                    g['name'] = name
+                                if len(note) > 0:
+                                    g['note'] = note
+                            elif len(remaining) > 0:
+                                g['name'] = remaining

                             gastronomy.append(g)
                         else:
                             break
                             gastronomy.append(g)
                         else:
                             break

diff --git a/wrpylib/templates/sledrun_wikitext.txt b/wrpylib/templates/sledrun_wikitext.txt
index bab2b76ed83e80bf72cd6ffe66b7be97810fc0ff..ceb7fd1923142ed89fe9db991bc34f0d3d4a6030 100644 (file)
--- a/wrpylib/templates/sledrun_wikitext.txt
+++ b/wrpylib/templates/sledrun_wikitext.txt
@@ -27,7 +27,8 @@
 * '''Betreiber''': {{ operator }}
 * '''Hütten''':
 {%- for info in gastronomy %}
 * '''Betreiber''': {{ operator }}
 * '''Hütten''':
 {%- for info in gastronomy %}

-** {% if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}
+** {{ info.name }}
+   {%- if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}

    {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
    {%- if info.note %} ({{ info.note }}){% endif %}
 {%- endfor %}
    {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
    {%- if info.note %} ({{ info.note }}){% endif %}
 {%- endfor %}