1.1 --- a/parsers/MoinShare.py Sat Apr 14 00:42:16 2012 +0200
1.2 +++ b/parsers/MoinShare.py Wed Apr 18 01:12:13 2012 +0200
1.3 @@ -22,7 +22,7 @@
1.4 """
1.5 Format shared content fragments of the form...
1.6
1.7 - {{{#!MoinShare ref=fragment format=content-type
1.8 + {{{#!MoinShare fragment=fragment-id ref=ref-fragment-id format=content-format
1.9
1.10 Content...
1.11 }}}
1.12 @@ -45,14 +45,16 @@
1.13
1.14 quotes = '"' + "'"
1.15
1.16 - # Get any reference to another fragment.
1.17 + # Get any reference to this fragment, another fragment and the content
1.18 + # format.
1.19
1.20 + self.fragment = (attrs.get("fragment") or '').strip(quotes)
1.21 self.ref = (attrs.get("ref") or '').strip(quotes)
1.22 self.format_type = (attrs.get("format") or '').strip(quotes)
1.23
1.24 - def getFragmentIdentifier(self):
1.25 + def getDigest(self):
1.26
1.27 - "Make a unique identifier for the fragment."
1.28 + "Make a message digest for the fragment's content."
1.29
1.30 return sha1(self.raw).hexdigest()
1.31
1.32 @@ -61,10 +63,9 @@
1.33 "Format a fragment using the given formatter 'fmt'."
1.34
1.35 request = self.request
1.36 - page = request.page
1.37 - _ = request.getText
1.38
1.39 - request.write(fmt.anchordef(self.getFragmentIdentifier()))
1.40 + if self.fragment:
1.41 + request.write(fmt.anchordef(self.fragment))
1.42
1.43 request.write(fmt.div(1, css_class="moinsharefragment"))
1.44 request.write(self.formatText(self.raw, fmt))