git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- call AddPersonToSlice
[plcapi.git]
/
PLC
/
Nodes.py
diff --git
a/PLC/Nodes.py
b/PLC/Nodes.py
index
c418242
..
9468c07
100644
(file)
--- a/
PLC/Nodes.py
+++ b/
PLC/Nodes.py
@@
-4,7
+4,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Nodes.py,v 1.2
8 2006/12/05 16:45:03 thierry
Exp $
+# $Id: Nodes.py,v 1.2
9 2007/01/09 16:13:36 mlhuang
Exp $
#
from types import StringTypes
#
from types import StringTypes
@@
-118,17
+118,12
@@
class Nodes(Table):
database.
"""
database.
"""
- def __init__(self, api, node_filter = None, columns = None
, peer_id = None
):
+ def __init__(self, api, node_filter = None, columns = None):
Table.__init__(self, api, Node, columns)
sql = "SELECT %s FROM view_nodes WHERE deleted IS False" % \
", ".join(self.columns)
Table.__init__(self, api, Node, columns)
sql = "SELECT %s FROM view_nodes WHERE deleted IS False" % \
", ".join(self.columns)
- if peer_id is None:
- sql += " AND peer_id IS NULL"
- elif isinstance(peer_id, (int, long)):
- sql += " AND peer_id = %d" % peer_id
-
if node_filter is not None:
if isinstance(node_filter, (list, tuple, set)):
# Separate the list into integers and strings
if node_filter is not None:
if isinstance(node_filter, (list, tuple, set)):
# Separate the list into integers and strings