Added a test for wrmwmarkup.py and adjusted the module.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wrpylib@754 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/tests/test_wrmwmarkup.py b/tests/test_wrmwmarkup.py
new file mode 100644 (file)
index 0000000..18af9bc
--- /dev/null
+++ b/tests/test_wrmwmarkup.py
@@ -0,0 +1,62 @@
+#!/usr/bin/python2.6
+# -*- coding: iso-8859-15 -*-
+import wrpylib.wrmwmarkup
+import formencode
+
+
+def test_rodelbahnbox_to_sledrun():
+    wikitext = u'''== Allgemeines ==
+    {{Rodelbahnbox
+    | Position             = 47.309820 N 9.986508 E
+    | Position oben        = 
+    | Höhe oben            = 1244
+    | Position unten       = 
+    | Höhe unten           = 806
+    | Länge                = 5045
+    | Schwierigkeit        = 
+    | Lawinen              = gelegentlich
+    | Betreiber            = 
+    | Öffentliche Anreise  = Ja
+    | Gehzeit              = 105
+    | Aufstieg getrennt    = Nein
+    | Aufstiegshilfe       = Nein
+    | Beleuchtungsanlage   = Nein
+    | Beleuchtungstage     = 
+    | Rodelverleih         = Ja
+    | Gütesiegel           = 
+    | Webauskunft          = 
+    | Telefonauskunft      = +43-664-1808482 (Bergkristallhütte)
+    | Bild                 = Rodelbahn Bergkristallhütte 2009-03-03.jpg
+    | In Übersichtskarte   = Ja
+    | Forumid              = 72
+    }}
+    Die Rodelbahn zur Bergkristallhütte ist durchaus abwechslungsreich.'''
+    class Sledrun(object): pass
+    sledrun = Sledrun()
+    wrpylib.wrmwmarkup.rodelbahnbox_to_sledrun(wikitext, sledrun)
+    wrpylib.wrmwmarkup.sledrun_to_rodelbahnbox(sledrun)
+
+
+
+def test_gasthausbox_to_inn():
+    wikitext = u'''{{Gasthausbox
+    | Position          = 47.295549 N 9.986970 E
+    | Höhe              = 1250
+    | Betreiber         = 
+    | Sitzplätze        = 
+    | Übernachtung      = 
+    | Rauchfrei         = Nein
+    | Rodelverleih      = 
+    | Handyempfang      = A1; T-Mobile/Telering
+    | Homepage          = http://www.bergkristallhuette.com/
+    | E-Mail            = bergkristallhuette@gmx.at
+    | Telefon           = +43-664-1808482
+    | Bild              = Bergkritsallhütte 2009-02-07.JPG
+    | Rodelbahnen       = [[Bergkristallhütte]]
+    }}
+    Die Bergkristallhütte ist Teil des Boden-Vorsäß.'''
+    class Inn(object): pass
+    inn = Inn()
+    wrpylib.wrmwmarkup.gasthausbox_to_inn(wikitext, inn)
+    wrpylib.wrmwmarkup.inn_to_gasthausbox(inn)
+

diff --git a/wrpylib/mwapi.py b/wrpylib/mwapi.py
index 5e23fecfb21da1db7fb30d31fb60a6d57cd9db6c..2ff2731376d3d5737d096bb9c06a8d334284169b 100644 (file)
--- a/wrpylib/mwapi.py
+++ b/wrpylib/mwapi.py
@@ -9,4 +9,9 @@ good Python wrapper implementation of the MediaWiki API:
 Therefore this module doesn't need to have much content.
 """
 
+def to_title(value):
+    """Line 2237 of includes/Title.php says: $this->mTextform = str_replace( '_', ' ', $dbkey );
+    No not check for None because a missing title is an error"""
+    return value.replace(u'_', u' ')
+
 

diff --git a/wrpylib/mwmarkup.py b/wrpylib/mwmarkup.py
index 11d1596f902700827dac4bfb1ce995ad705d0bef..41b9b3999cc18aef86333deb5e9812690cd5f014 100644 (file)
--- a/wrpylib/mwmarkup.py
+++ b/wrpylib/mwmarkup.py
@@ -10,4 +10,3 @@ that convinced me. However, here are the links:
 * mwlib http://code.pediapress.com/wiki/wiki
 """
 
-

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 26c833b9a03e8606c393de383e46cca25a26b1d8..37f445db85fecc40cd100e6ac01d771810836dc1 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -4,4 +4,195 @@
 # $HeadURL$
 """This module contains winterrodeln specific functions that are prcocessing the MediaWiki markup.
 """
+import re
+import formencode
+import wrpylib.wrvalidators
+
+
+def _conv(fnct, value, fieldname):
+    "Like one of the to_xxx functions (e.g. to_bool), but adds the field name to the error message"
+    try: return fnct(value)
+    except formencode.Invalid, e: raise formencode.Invalid(u"Conversion error in field '%s': %s" % (fieldname, unicode_e(e)), e.value, e.state)
+
+
+def rodelbahnbox_to_sledrun(wikitext, sledrun):
+    """Converts a sledrun wiki page containing the {{Rodelbahnbox}}
+    to a sledrun. sledrun may be an instance of WrSledrunCache.
+    Raises a formencode.Invalid exception if the format is not OK.
+    :return: (start, end) tuple of the Rodelbahnbox."""
+    # Match Rodelbahnbox
+    regexp = re.compile(u"\{\{(Rodelbahnbox[^\}]*)\}\}", re.DOTALL)
+    match = regexp.search(wikitext)
+    if not match:
+        raise formencode.Invalid(u"Rodelbahnbox nicht gefunden", wikitext, None)
+    box = match.group(1)
+    
+    # Process Rodelbahnbox
+    for property in box.split('|'):
+        property = property.strip()
+        if property == u'Rodelbahnbox': continue
+        equalsign_pos = property.find('=')
+        if equalsign_pos < 0:
+            raise formencode.Invalid(u"Die Eigenschaft '%s' hat ein unerwartetes Format." % property, wikitext, None)
+        key = property[:equalsign_pos].strip()
+        value = property[equalsign_pos+1:].strip()
+        if key in [u'Rodelbahnnummer', u'Lift']:
+            errors.append("Eigenschaft '%s' wird nicht mehr unterstuetzt, siehe %s." % (key, 'http://www.winterrodeln.org/wiki/Vorlage:Rodelbahnbox'))
+        elif key == u'Position': sledrun.position_latitude, sledrun.position_longitude = _conv(wrpylib.wrvalidators.GeoNone().to_python, value, key) # '47.583333 N 15.75 E'
+        elif key == u'Position oben': sledrun.top_latitude, sledrun.top_longitude = _conv(wrpylib.wrvalidators.GeoNone().to_python, value, key) # '47.583333 N 15.75 E'
+        elif key == u'Höhe oben': sledrun.top_elevation = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key) # '2000'
+        elif key == u'Position unten': sledrun.bottom_latitude, sledrun.bottom_longitude = _conv(wrpylib.wrvalidators.GeoNone().to_python, value, key) # '47.583333 N 15.75 E'
+        elif key == u'Höhe unten': sledrun.bottom_elevation = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key) # '1200'
+        elif key == u'Länge': sledrun.length = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key) # 3500
+        elif key == u'Schwierigkeit': sledrun.difficulty = _conv(wrpylib.wrvalidators.GermanDifficulty().to_python, value, key) # 'mittel' elif key == u'Lawinen': sledrun.avalanches = _conv(wrpylib.wrvalidators.GermanAvalanches().to_python, value, key) # 'kaum'
+        elif key == u'Lawinen': sledrun.avalanches = _conv(wrpylib.wrvalidators.GermanAvalanches().to_python, value, key) # 'kaum'
+        elif key == u'Betreiber': sledrun.operator = _conv(wrpylib.wrvalidators.UnicodeNone().to_python, value, key) # 'Max Mustermann'
+        elif key == u'Öffentliche Anreise': sledrun.public_transport = _conv(wrpylib.wrvalidators.GermanPublicTransport().to_python, value, key) # 'Mittelmäßig'
+        elif key == u'Gehzeit': sledrun.walkup_time = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key) # 90
+        elif key == u'Aufstieg möglich': sledrun.walkup_separate, sledrun.walkup_separate_comment = _conv(wrpylib.wrvalidators.GermanTristateFloatComment().to_python, value, key) # 'Ja'
+        elif key == u'Aufstieg getrennt': sledrun.walkup_separate, sledrun.walkup_separate_comment = _conv(wrpylib.wrvalidators.GermanTristateFloatComment().to_python, value, key) # 'Ja'
+        elif key == u'Aufstiegshilfe': sledrun.lift, sledrun.lift_details = _conv(wrpylib.wrvalidators.GermanLift().to_python, value, key) # 'Gondel (unterer Teil)'
+        elif key == u'Beleuchtungsanlage': sledrun.night_light, sledrun.night_light_comment = _conv(wrpylib.wrvalidators.GermanTristateFloatComment().to_python, value, key)
+        elif key == u'Beleuchtungstage': sledrun.night_light_days, sledrun.night_light_days_comment = _conv(wrpylib.wrvalidators.UnsignedCommentNone(7).to_python, value, key) # '3 (Montag, Mittwoch, Freitag)'
+        elif key == u'Rodelverleih': sledrun.sled_rental, sledrun.sled_rental_comment = _conv(wrpylib.wrvalidators.SledRental().to_python, value, key) # 'Talstation Serlesbahnan'
+        elif key == u'Gütesiegel': sledrun.cachet = _conv(wrpylib.wrvalidators.GermanCachet().to_python, value, key) # 'Tiroler Naturrodelbahn-Gütesiegel 2009 mittel'
+        elif key == u'Webauskunft': sledrun.information_web = _conv(wrpylib.wrvalidators.UrlNeinNone().to_python, value, key) # 'http://www.nösslachhütte.at/page9.php'
+        elif key == u'Telefonauskunft': sledrun.information_phone = _conv(wrpylib.wrvalidators.PhoneCommentListNeinLoopNone(comments_are_optional=False).to_python, value, key) # '+43-664-5487520 (Mitterer Alm)'
+        elif key == u'Bild': sledrun.image = _conv(wrpylib.wrvalidators.UnicodeNone().to_python, value, key)
+        elif key == u'In Übersichtskarte': sledrun.show_in_overview = _conv(wrpylib.wrvalidators.GermanBoolNone().to_python, value, key)
+        elif key == u'Forumid': sledrun.forum_id = _conv(wrpylib.wrvalidators.UnsignedNeinNone().to_python, value, key)
+        else: raise formencode.Invalid(u"Unbekannte Eigenschaft der Rodelbahnbox: '%s' (mit Wert '%s')" % (key, value), value, None)
+    return match.span()
+
+
+
+def sledrun_to_rodelbahnbox(sledrun):
+    """Converts a sledrun class to the {{Rodelbahnbox}} representation.
+    The sledrun class has to have properties like position_latitude, ...
+    See the table sledruncache for field (column) values."""
+    keys = []
+    values = []
+    keys.append(u'Position')
+    values.append(wrpylib.wrvalidators.GeoNone().from_python((sledrun.position_latitude, sledrun.position_longitude)))
+    keys.append(u'Position oben')
+    values.append(wrpylib.wrvalidators.GeoNone().from_python((sledrun.top_latitude, sledrun.top_longitude)))
+    keys.append(u'Höhe oben')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(sledrun.top_elevation))
+    keys.append(u'Position unten')
+    values.append(wrpylib.wrvalidators.GeoNone().from_python((sledrun.bottom_latitude, sledrun.bottom_longitude)))
+    keys.append(u'Höhe unten')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(sledrun.bottom_elevation))
+    keys.append(u'Länge')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(sledrun.length))
+    keys.append(u'Schwierigkeit')
+    values.append(wrpylib.wrvalidators.GermanDifficulty().from_python(sledrun.difficulty))
+    keys.append(u'Lawinen')
+    values.append(wrpylib.wrvalidators.GermanAvalanches().from_python(sledrun.avalanches))
+    keys.append(u'Betreiber')
+    values.append(wrpylib.wrvalidators.UnicodeNone().from_python(sledrun.operator))
+    keys.append(u'Öffentliche Anreise')
+    values.append(wrpylib.wrvalidators.GermanPublicTransport().from_python(sledrun.public_transport))
+    keys.append(u'Gehzeit')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(sledrun.walkup_time))
+    keys.append(u'Aufstieg getrennt')
+    values.append(wrpylib.wrvalidators.GermanTristateFloatComment().from_python((sledrun.walkup_separate, sledrun.walkup_separate_comment)))
+    keys.append(u'Aufstiegshilfe')
+    values.append(wrpylib.wrvalidators.GermanLift().from_python((sledrun.lift, sledrun.lift_details)))
+    keys.append(u'Beleuchtungsanlage')
+    values.append(wrpylib.wrvalidators.GermanTristateFloatComment().from_python((sledrun.night_light, sledrun.night_light_comment)))
+    keys.append(u'Beleuchtungstage')
+    values.append(wrpylib.wrvalidators.UnsignedCommentNone(max=7).from_python((sledrun.night_light_days, sledrun.night_light_days_comment)))
+    keys.append(u'Rodelverleih')
+    values.append(wrpylib.wrvalidators.SledRental().from_python((sledrun.sled_rental, sledrun.sled_rental_comment)))
+    keys.append(u'Gütesiegel')
+    values.append(wrpylib.wrvalidators.GermanCachet().from_python(sledrun.cachet))
+    keys.append(u'Webauskunft')
+    values.append(wrpylib.wrvalidators.UrlNeinNone().from_python(sledrun.information_web))
+    keys.append(u'Telefonauskunft')
+    values.append(wrpylib.wrvalidators.PhoneCommentListNeinLoopNone(comments_are_optional=False).from_python(sledrun.information_phone))
+    keys.append(u'Bild')
+    values.append(wrpylib.wrvalidators.UnicodeNone().from_python(sledrun.image))
+    keys.append(u'In Übersichtskarte')
+    values.append(wrpylib.wrvalidators.GermanBoolNone().from_python(sledrun.show_in_overview))
+    keys.append(u'Forumid')
+    values.append(wrpylib.wrvalidators.UnsignedNeinNone().from_python(sledrun.forum_id))
+    result = [u'{{Rodelbahnbox']
+    for i in xrange(len(keys)): result.append(u'| %-20s = %s' % (keys[i], values[i]))
+    result.append('}}')
+    return '\n'.join(result)
+
+
+
+def gasthausbox_to_inn(wikitext, inn):
+    """Converts a inn wiki page containing a {{Gasthausbox}} to an inn.
+    raises a formencode.Invalid exception if an error occurs.
+    :return: (start, end) tuple."""
+    # Match Gasthausbox
+    regexp = re.compile(u"\{\{(Gasthausbox[^\}]*)\}\}", re.DOTALL)
+    match = regexp.search(wikitext)
+    if not match:
+        raise formencode.Invalid(u"No 'Gasthausbox' found")
+    box = match.group(1)
+    
+    # Process Gashausbox
+    for property in box.split('|'):
+        property = property.strip()
+        if property == u'Gasthausbox': continue
+        key_value = property.split('=')
+        if len(key_value) != 2:
+            raise formencode.Invalid(u"Property '%s' has unexpected format" % key_value, wikitext, None)
+        key = key_value[0].strip()
+        value = key_value[1].strip()
+        if key == u'Position': inn.position_latitude, inn.position_longitude = _conv(wrpylib.wrvalidators.GeoNone().to_python, value, key) # '47.583333 N 15.75 E'
+        elif key == u'Höhe': inn.position_elevation = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key)
+        elif key == u'Betreiber': inn.operator = _conv(wrpylib.wrvalidators.UnicodeNone().to_python, value, key)
+        elif key == u'Sitzplätze': inn.seats = _conv(wrpylib.wrvalidators.UnsignedNone().to_python, value, key)
+        elif key == u'Übernachtung': inn.overnight, inn.overnight_comment = _conv(wrpylib.wrvalidators.BoolUnicodeTupleValidator().to_python, value, key)
+        elif key == u'Rauchfrei': inn.nonsmoker_area, inn.smoker_area = _conv(wrpylib.wrvalidators.GermanTristateTuple().to_python, value, key)
+        elif key == u'Rodelverleih': inn.sled_rental, inn.sled_rental_comment = _conv(wrpylib.wrvalidators.BoolUnicodeTupleValidator().to_python, value, key)
+        elif key == u'Handyempfang': inn.mobile_provider = _conv(wrpylib.wrvalidators.ValueCommentListNeinLoopNone().to_python, value, key)
+        elif key == u'Homepage': inn.homepage = _conv(wrpylib.wrvalidators.UrlNeinNone().to_python, value, key)
+        elif key == u'E-Mail': inn.email_list = _conv(wrpylib.wrvalidators.EmailCommentListNeinLoopNone().to_python, value, key)
+        elif key == u'Telefon': inn.phone_list = _conv(wrpylib.wrvalidators.PhoneCommentListNeinLoopNone(comments_are_optional=True).to_python, value, key)
+        elif key == u'Bild': inn.image = _conv(wrpylib.wrvalidators.UnicodeNone().to_python, value, key)
+        elif key == u'Rodelbahnen': inn.sledding_list = _conv(wrpylib.wrvalidators.WikiPageListLoopNone().to_python, value, key)
+        else: raise formencode.Invalid(u"Unbekannte Eigenschaft der Gasthausbox: '%s' (mit Wert '%s')" % (key, value), value, None)
+    return match.span()
+
+
+def inn_to_gasthausbox(inn):
+    """Converts the inn class to the {{Gasthausbox}} representation."""
+    keys = []
+    values = []
+    keys.append(u'Position')
+    values.append(wrpylib.wrvalidators.GeoNone().from_python((inn.position_latitude, inn.position_longitude)))
+    keys.append(u'Höhe')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(inn.position_elevation))
+    keys.append(u'Betreiber')
+    values.append(wrpylib.wrvalidators.UnicodeNone().from_python(inn.operator))
+    keys.append(u'Sitzplätze')
+    values.append(wrpylib.wrvalidators.UnsignedNone().from_python(inn.seats))
+    keys.append(u'Übernachtung')
+    values.append(wrpylib.wrvalidators.BoolUnicodeTupleValidator().from_python((inn.overnight, inn.overnight_comment)))
+    keys.append(u'Rauchfrei')
+    values.append(wrpylib.wrvalidators.GermanTristateTuple().from_python((inn.nonsmoker_area, inn.smoker_area)))
+    keys.append(u'Rodelverleih')
+    values.append(wrpylib.wrvalidators.BoolUnicodeTupleValidator().from_python((inn.sled_rental, inn.sled_rental_comment)))
+    keys.append(u'Handyempfang')
+    values.append(wrpylib.wrvalidators.ValueCommentListNeinLoopNone().from_python(inn.mobile_provider))
+    keys.append(u'Homepage')
+    values.append(wrpylib.wrvalidators.UrlNeinNone().from_python(inn.homepage))
+    keys.append(u'E-Mail')
+    values.append(wrpylib.wrvalidators.EmailCommentListNeinLoopNone().from_python(inn.email_list))
+    keys.append(u'Telefon')
+    values.append(wrpylib.wrvalidators.PhoneCommentListNeinLoopNone(comments_are_optional=True).from_python(inn.phone_list))
+    keys.append(u'Bild')
+    values.append(wrpylib.wrvalidators.UnicodeNone().from_python(inn.image))
+    keys.append(u'Rodelbahnen')
+    values.append(wrpylib.wrvalidators.WikiPageListLoopNone().from_python(inn.sledding_list))
+    result = [u'{{Gasthausbox']
+    for i in xrange(len(keys)): result.append(u'| %-17s = %s' % (keys[i], values[i]))
+    result.append('}}\n')
+    return '\n'.join(result)
+