IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove line column from node table

Browse Source
This commit is contained in:
Jacob Mason 2010-08-14 17:59:31 -05:00
parent f94df908bc
commit a52fd809bf
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/websupport/storage/__init__.py
View File

@ -16,15 +16,11 @@ class StorageBackend(object):
""" """
pass pass
def add_node(self, id, document, line, source): def add_node(self, id, document, source):
"""Add a node to the StorageBackend. """Add a node to the StorageBackend.
:param id: a unique id for the comment. :param id: a unique id for the comment.
:param document: the name of the document the node belongs to. :param document: the name of the document the node belongs to.
:param line: the line in the source where the node begins.
:param source: the source files name. :param source: the source files name.
""" """
raise NotImplementedError() raise NotImplementedError()

4
sphinx/websupport/storage/db.py
View File

@ -31,7 +31,6 @@ class Node(Base):
id = Column(String(32), primary_key=True) id = Column(String(32), primary_key=True)
document = Column(String(256), nullable=False) document = Column(String(256), nullable=False)
line = Column(Integer)
source = Column(Text, nullable=False) source = Column(Text, nullable=False)
def nested_comments(self, username, moderator): def nested_comments(self, username, moderator):
@ -94,10 +93,9 @@ class Node(Base):
return comments return comments
def __init__(self, id, document, line, source): def __init__(self, id, document, source):
self.id = id self.id = id
self.document = document self.document = document
self.line = line
self.source = source self.source = source
class Comment(Base): class Comment(Base):

4
sphinx/websupport/storage/sqlalchemystorage.py
View File

@ -33,8 +33,8 @@ class SQLAlchemyStorage(StorageBackend):
def pre_build(self): def pre_build(self):
self.build_session = Session() self.build_session = Session()
def add_node(self, id, document, line, source): def add_node(self, id, document, source):
node = Node(id, document, line, source) node = Node(id, document, source)
self.build_session.add(node) self.build_session.add(node)
self.build_session.flush() self.build_session.flush()
return node return node

1
sphinx/writers/websupport.py
View File

@ -41,6 +41,5 @@ class WebSupportTranslator(HTMLTranslator):
storage = self.builder.app.storage storage = self.builder.app.storage
db_node_id = storage.add_node(id=node.uid, db_node_id = storage.add_node(id=node.uid,
document=self.builder.cur_docname, document=self.builder.cur_docname,
line=node.line,
source=node.rawsource or node.astext()) source=node.rawsource or node.astext())
return db_node_id return db_node_id