X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Ffilter.py;h=2a3b8953ec0837149d6ed262b97366018c2cd597;hb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;hp=ba7cdae89715531a04f100af9c0825d1f519a0f5;hpb=a617e323c127fd375b4159a77c52c054317b893a;p=sfa.git

diff --git a/sfa/util/filter.py b/sfa/util/filter.py
index ba7cdae8..2a3b8953 100644
--- a/sfa/util/filter.py
+++ b/sfa/util/filter.py
@@ -1,5 +1,5 @@
-# $Id: Filter.py 14587 2009-07-19 13:18:50Z thierry $
-# $URL: svn+ssh://svn.planet-lab.org/svn/PLCAPI/trunk/PLC/Filter.py $
+# $Id$
+# $URL$
 from types import StringTypes
 try:
     set
@@ -96,7 +96,7 @@ class Filter(Parameter, dict):
         # The pgdb._quote function is good enough for general SQL
         # quoting, except for array types.
         if isinstance(value, (list, tuple, set)):
-            return "ARRAY[%s]" % ", ".join(map, self.quote, value)
+            return "ARRAY[%s]" % ", ".join(map(self.quote, value))
         else:
             return pgdb._quote(value)    
 
@@ -136,7 +136,7 @@ class Filter(Parameter, dict):
             # filter on fields
             if not modifiers['-']:
                 if field not in self.fields:
-                    raise GeniInvalidArgument, "Invalid filter field '%s'" % field
+                    raise SfaInvalidArgument, "Invalid filter field '%s'" % field
 
                 if isinstance(value, (list, tuple, set)):
                     # handling filters like '~slice_id':[]
@@ -186,7 +186,7 @@ class Filter(Parameter, dict):
             # sorting and clipping
             else:
                 if field not in ('SORT','OFFSET','LIMIT'):
-                    raise GeniInvalidArgument, "Invalid filter, unknown sort and clip field %r"%field
+                    raise SfaInvalidArgument, "Invalid filter, unknown sort and clip field %r"%field
                 # sorting
                 if field == 'SORT':
                     if not isinstance(value,(list,tuple,set)):
@@ -199,7 +199,7 @@ class Filter(Parameter, dict):
                             field = field[1:]
                             order = 'DESC'
                         if field not in self.fields:
-                            raise GeniInvalidArgument, "Invalid field %r in SORT filter"%field
+                            raise SfaInvalidArgument, "Invalid field %r in SORT filter"%field
                         sorts.append("%s %s"%(field,order))
                 # clipping
                 elif field == 'OFFSET':
@@ -214,5 +214,4 @@ class Filter(Parameter, dict):
             clip_part += " ORDER BY " + ",".join(sorts)
         if clips:
             clip_part += " " + " ".join(clips)
-#	print 'where_part=',where_part,'clip_part',clip_part
         return (where_part,clip_part)