ignore wiki linking at the moment; needs change in order to use new link and link manager implementations

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3681 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2010-01-13 16:31:08 +00:00
parent d670c50021
commit 94b9143b30
4 changed files with 6 additions and 8 deletions

View file

@ -542,7 +542,7 @@ view for rendering.)
>>> from loops.wiki.base import wikiLinksActive >>> from loops.wiki.base import wikiLinksActive
>>> wikiLinksActive(loopsRoot) >>> wikiLinksActive(loopsRoot)
True False
>>> view.renderTarget() >>> view.renderTarget()
u'<p>Test data</p>\n<p>Another <a class="reference" href="para">paragraph</a></p>\n' u'<p>Test data</p>\n<p>Another <a class="reference" href="para">paragraph</a></p>\n'

View file

@ -50,7 +50,7 @@ from cybertools.wiki.base.config import WikiConfiguration
from cybertools.wiki.dcu.html import Writer as DocutilsHTMLWriter from cybertools.wiki.dcu.html import Writer as DocutilsHTMLWriter
from cybertools.wiki.dcu import process from cybertools.wiki.dcu import process
from cybertools.wiki.dcu.rstx import Parser as DocutilsRstxParser from cybertools.wiki.dcu.rstx import Parser as DocutilsRstxParser
from cybertools.wiki.tracking.link import LinkManager #from cybertools.wiki.tracking.link import LinkManager
from loops.base import Loops from loops.base import Loops
from loops import util from loops import util
@ -186,7 +186,7 @@ class TestSite(object):
component.provideAdapter(WikiSetupManager, name='wiki') component.provideAdapter(WikiSetupManager, name='wiki')
component.provideUtility(WikiConfiguration()) component.provideUtility(WikiConfiguration())
component.provideAdapter(LinkManager) #component.provideAdapter(LinkManager)
component.provideUtility(DocutilsHTMLWriter(), name='docutils.html') component.provideUtility(DocutilsHTMLWriter(), name='docutils.html')
component.provideUtility(DocutilsRstxParser(), name='docutils.rstx') component.provideUtility(DocutilsRstxParser(), name='docutils.rstx')
#component.provideAdapter(LoopsLinkProcessor, name='loops') #component.provideAdapter(LoopsLinkProcessor, name='loops')

View file

@ -13,8 +13,6 @@
<zope:utility factory="cybertools.wiki.dcu.rstx.Parser" <zope:utility factory="cybertools.wiki.dcu.rstx.Parser"
name="docutils.rstx" /> name="docutils.rstx" />
<zope:adapter factory="cybertools.wiki.tracking.link.LinkManager" />
<!--<zope:adapter factory="loops.wiki.link.LoopsLinkProcessor" <!--<zope:adapter factory="loops.wiki.link.LoopsLinkProcessor"
name="loops" />--> name="loops" />-->

View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2009 Helmut Merz helmutm@cy55.de # Copyright (c) 2010 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -22,14 +22,14 @@ Automatic setup of a loops site for the wiki package.
$Id$ $Id$
""" """
from cybertools.tracking.btree import TrackingStorage from cybertools.link.base import LinkManager
from cybertools.wiki.tracking.link import Link
from loops.setup import SetupManager as BaseSetupManager from loops.setup import SetupManager as BaseSetupManager
class SetupManager(BaseSetupManager): class SetupManager(BaseSetupManager):
def setup(self): def setup(self):
return
records = self.context.getRecordManager() records = self.context.getRecordManager()
if 'links' not in records: if 'links' not in records:
records['links'] = TrackingStorage(trackFactory=Link) records['links'] = TrackingStorage(trackFactory=Link)