From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 9 Feb 2007 19:26:56 +0000 (+0000)
Subject: - changed how Slices formats 'expires' variable in the sql string. This seems to... 
X-Git-Tag: PLCAPI-4.2-0~197
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4dd7cf29c42d177ea1ecff059af1837969903e2f;p=plcapi.git

- changed how Slices formats 'expires' variable in the sql string. This seems to make psycopg happy and solves some database exceptions we were seeing when tyring to use wildcard searches in slice_filter.
---

diff --git a/PLC/Slices.py b/PLC/Slices.py
index a41e88d3..c8f6e812 100644
--- a/PLC/Slices.py
+++ b/PLC/Slices.py
@@ -137,10 +137,10 @@ class Slices(Table):
 
         if expires is not None:
             if expires >= 0:
-                sql += " AND expires > %(expires)d"
+                sql += " AND expires > %d" % expires
             else:
                 expires = -expires
-                sql += " AND expires < %(expires)d"
+                sql += " AND expires < %d" % expires
 
         if slice_filter is not None:
             if isinstance(slice_filter, (list, tuple, set)):
@@ -153,4 +153,4 @@ class Slices(Table):
                 slice_filter = Filter(Slice.fields, slice_filter)
                 sql += " AND (%s)" % slice_filter.sql(api, "AND")
 
-        self.selectall(sql, locals())
+        self.selectall(sql)