From c9ceaaa53b1c0b03f408e9c19f74b2f26354ef4e Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 2 Oct 2006 16:04:42 +0000
Subject: [PATCH] - do not document or advertise deleted, this is an internal
field
---
PLC/Nodes.py | 5 ++---
PLC/Persons.py | 12 ++++--------
PLC/Sites.py | 6 ++----
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/PLC/Nodes.py b/PLC/Nodes.py
index e227e064..35b1ab48 100644
--- 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
#
-# $Id: Nodes.py,v 1.5 2006/09/25 18:11:10 mlhuang Exp $
+# $Id: Nodes.py,v 1.6 2006/10/02 15:21:03 mlhuang Exp $
#
from types import StringTypes
@@ -35,7 +35,6 @@ class Node(Row):
'ssh_rsa_key': Parameter(str, "Last known SSH host key", max = 1024),
'date_created': Parameter(str, "Date and time when node entry was created"),
'last_updated': Parameter(str, "Date and time when node entry was created"),
- 'deleted': Parameter(bool, "Has been deleted"),
'key': Parameter(str, "(Admin only) Node key", max = 256),
'session': Parameter(str, "(Admin only) Node session value", max = 256),
'nodenetwork_ids': Parameter([int], "List of network interfaces that this node has"),
@@ -64,7 +63,7 @@ class Node(Row):
conflicts = Nodes(self.api, [hostname])
for node_id, node in conflicts.iteritems():
- if not node['deleted'] and ('node_id' not in self or self['node_id'] != node_id):
+ if 'node_id' not in self or self['node_id'] != node_id:
raise PLCInvalidArgument, "Hostname already in use"
# Check for conflicts with a nodenetwork hostname
diff --git a/PLC/Persons.py b/PLC/Persons.py
index 6b811b83..b549a94a 100644
--- a/PLC/Persons.py
+++ b/PLC/Persons.py
@@ -4,7 +4,7 @@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Persons.py,v 1.4 2006/09/25 15:10:00 mlhuang Exp $
+# $Id: Persons.py,v 1.5 2006/10/02 15:25:03 mlhuang Exp $
#
from types import StringTypes
@@ -41,7 +41,6 @@ class Person(Row):
'url': Parameter(str, "Home page", max = 254),
'bio': Parameter(str, "Biography", max = 254),
'enabled': Parameter(bool, "Has been enabled"),
- 'deleted': Parameter(bool, "Has been deleted"),
'password': Parameter(str, "Account password in crypt() form", max = 254),
'last_updated': Parameter(str, "Date and time of last update"),
'date_created': Parameter(str, "Date and time when account was created"),
@@ -86,7 +85,7 @@ class Person(Row):
conflicts = Persons(self.api, [email])
for person_id, person in conflicts.iteritems():
- if not person['deleted'] and ('person_id' not in self or self['person_id'] != person_id):
+ if 'person_id' not in self or self['person_id'] != person_id:
raise PLCInvalidArgument, "E-mail address already in use"
return email
@@ -297,15 +296,12 @@ class Persons(Table):
non-deleted accounts.
"""
- def __init__(self, api, person_id_or_email_list = None, fields = Person.fields, deleted = False, enabled = None):
+ def __init__(self, api, person_id_or_email_list = None, fields = Person.fields, enabled = None):
self.api = api
- sql = "SELECT %s FROM view_persons WHERE TRUE" % \
+ sql = "SELECT %s FROM view_persons WHERE deleted IS False" % \
", ".join(fields)
- if deleted is not None:
- sql += " AND deleted IS %(deleted)s"
-
if enabled is not None:
sql += " AND enabled IS %(enabled)s"
diff --git a/PLC/Sites.py b/PLC/Sites.py
index aac4a6d3..d18dac3e 100644
--- a/PLC/Sites.py
+++ b/PLC/Sites.py
@@ -30,7 +30,6 @@ class Site(Row):
'url': Parameter(str, "URL of a page that describes the site", max = 254),
'date_created': Parameter(int, "Date and time when site entry was created, in seconds since UNIX epoch"),
'last_updated': Parameter(int, "Date and time when site entry was last updated, in seconds since UNIX epoch"),
- 'deleted': Parameter(bool, "Has been deleted"),
'max_slices': Parameter(int, "Maximum number of slices that the site is able to create"),
'max_slivers': Parameter(int, "Maximum number of slivers that the site is able to create"),
'person_ids': Parameter([int], "List of account identifiers"),
@@ -51,7 +50,7 @@ class Site(Row):
login_base = login_base.lower()
conflicts = Sites(self.api, [login_base])
for site_id, site in conflicts.iteritems():
- if not site['deleted'] and ('site_id' not in self or self['site_id'] != site_id):
+ if 'site_id' not in self or self['site_id'] != site_id:
raise PLCInvalidArgument, "login_base already in use"
return login_base
@@ -187,8 +186,7 @@ class Site(Row):
person_sites = Sites(self.api, person['site_ids'])
for person_site_id, person_site in person_sites.iteritems():
- if person_site_id != self['site_id'] and \
- not person_site['deleted']:
+ if person_site_id != self['site_id']:
delete = False
break
--
2.47.0