Parse cachet.

diff --git a/bots/sledrun_wikitext_to_json.py b/bots/sledrun_wikitext_to_json.py
index 718b275479edc0fa64ed8dc02249423b0e832932..11070486fe7bf6a80171b2f14c7b9ff5a8361a5f 100644 (file)
--- a/bots/sledrun_wikitext_to_json.py
+++ b/bots/sledrun_wikitext_to_json.py
@@ -196,6 +196,12 @@ class SledrunWikiTextToJsonBot(
                     sledrun_json['sled_rental'] = w
             _sled_rental()
 
                     sledrun_json['sled_rental'] = w
             _sled_rental()
 

+            def _cachet():
+                v = rbb['Gütesiegel']
+                if v is not None:
+                    sledrun_json['cachet'] = len(v) > 0
+            _cachet()
+

             v = rbb['In Übersichtskarte']
             if v is not None:
                 sledrun_json['show_in_overview'] = v
             v = rbb['In Übersichtskarte']
             if v is not None:
                 sledrun_json['show_in_overview'] = v

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 90f52cad8f8b847cda49013c939bb6ce2f357e25..9426e9893eadce67101fe195006e82acc952d712 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -437,6 +437,13 @@ def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict], impression
             w.append((n, c))
         return w
 
             w.append((n, c))
         return w
 

+    def cachet() -> Optional[List]:
+        v = sledrun_json.get('cachet')
+        if v is not None:
+            if not v:
+                return []
+        return None
+

     def webauskunft() -> Tuple[Optional[bool], Optional[str]]:
         info_web = sledrun_json.get('info_web')
         if info_web is None:
     def webauskunft() -> Tuple[Optional[bool], Optional[str]]:
         info_web = sledrun_json.get('info_web')
         if info_web is None:


@@ -477,7 +484,7 @@ def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict], impression
         ('Beleuchtungsanlage', opt_tristate_german_comment_from_str(sledrun_json.get('nightlight_possible', ''))),
         ('Beleuchtungstage', nightlightdays_from_str(sledrun_json.get('nightlight_weekdays', ''))),
         ('Rodelverleih', rodelverleih()),
         ('Beleuchtungsanlage', opt_tristate_german_comment_from_str(sledrun_json.get('nightlight_possible', ''))),
         ('Beleuchtungstage', nightlightdays_from_str(sledrun_json.get('nightlight_weekdays', ''))),
         ('Rodelverleih', rodelverleih()),

-        ('Gütesiegel', None),
+        ('Gütesiegel', cachet()),

         ('Webauskunft', webauskunft()),
         ('Telefonauskunft', telefonauskunft()),
         ('Bild', sledrun_json.get('image')),
         ('Webauskunft', webauskunft()),
         ('Telefonauskunft', telefonauskunft()),
         ('Bild', sledrun_json.get('image')),

diff --git a/wrpylib/wrvalidators.py b/wrpylib/wrvalidators.py
index 61b141568a29a4fc78af906086848463d18db1a7..3b0ae5f84156d130f0ba4aa916a44ebf85e7c9c4 100644 (file)
--- a/wrpylib/wrvalidators.py
+++ b/wrpylib/wrvalidators.py
@@ -694,7 +694,7 @@ def single_cachet_german_to_str(value: Tuple[str, str, str]) -> str:
     return ' '.join(value)
 
 
     return ' '.join(value)
 
 

-def cachet_german_from_str(value):
+def cachet_german_from_str(value) -> Optional[List[Tuple[str, str, str]]]:

     """Converts a "Gütesiegel":
     '' => None
     'Nein' => []
     """Converts a "Gütesiegel":
     '' => None
     'Nein' => []