CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed problem with float numbers with selection of certain relations

Browse Source 
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@215 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf
2009-09-18 22:57:02 +00:00
parent 9c12a662ea
commit ffa7140c6d
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
relational/relation.py
View File

@@ -106,17 +106,16 @@ class relation (object):
newt.header=header(list(self.header.attributes))
for i in self.content:
for j in range(len(self.header.attributes)):
if i[j].isdigit():
if len(i[j])>0 and i[j].isdigit():
attributes[self.header.attributes[j]]=int(i[j])
elif rstring(i[j]).isFloat():
elif len(i[j])>0 and rstring(i[j]).isFloat():
attributes[self.header.attributes[j]]=float(i[j])
elif isDate(i[j]):
elif len(i[j])>0 and isDate(i[j]):
attributes[self.header.attributes[j]]=rdate(i[j])
else:
attributes[self.header.attributes[j]]=i[j]
if eval(expr,attributes):
newt.content.append(i)
return newt
@@ -259,8 +258,6 @@ class relation (object):
'''Does a left and a right outer join and returns their union.'''
a=self.outer_right(other)
b=self.outer_left(other)
print a
print b
return a.union(b)