Changeset 168:8c2f18a92853

Show
Ignore:
Timestamp:
01/01/09 17:38:41 (15 months ago)
Author:
rgrp
Branch:
default
convert_revision:
svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@245
Message:

[shksprdata/load.py,shakespeare][s]: code to load and display markdown formatted EB 11 material.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • shakespeare/controllers/text.py

    r164 r168  
    4040        namelist = name.split() 
    4141        numtexts = len(namelist) 
    42         textlist = [model.Material.byName(tname) for tname in namelist] 
     42        textlist = [model.Material.by_name(tname) for tname in namelist] 
    4343        # special case (only return the first text) 
    4444        if format == 'raw': 
     
    5050        for item in textlist: 
    5151            tfileobj = item.get_text() 
    52             ttext = shakespeare.format.format_text(tfileobj, format) 
     52            # hack for time being ... 
     53            if item.format == 'mkd': 
     54                ttext = h.markdown(tfileobj.read()) 
     55            else: 
     56                ttext = shakespeare.format.format_text(tfileobj, format) 
    5357            texthtml[item.name] = genshi.HTML(ttext) 
    5458        # would have assumed this would be 100.0/numtexts but for some reason