changed outer join syntax because the previous one didn't work

git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@19 014f5005-505e-4b48-8d0a-63407b615a7c
master
LtWorf 2008-07-21 08:03:50 +07:00
parent 889c333058
commit b61625f10d
1 changed files with 6 additions and 4 deletions

@ -21,7 +21,7 @@ def parse(expr):
executable by eval function to get the result of the expression.
It has 2 class of operators:
without parameters
*, -, , , ᐅᐊ, LEFT, RIGHT, FULL
*, -, , , ᐅᐊ, LEFT, RIGHT, FULL
with parameters:
σ, π, ρ
@ -118,14 +118,16 @@ def parse_op(expr):
result=""
symbols={}
symbols["*"]=".product(%s)"
symbols["-"]=".difference(%s)"
symbols[""]=".union(%s)"
symbols[""]=".intersection(%s)"
symbols["ᐅLEFTᐊ"]=".outer_left(%s)"
symbols["ᐅRIGHTᐊ"]=".outer_right(%s)"
symbols["ᐅFULLᐊ"]=".outer(%s)"
symbols["ᐅᐊ"]=".join(%s)"
symbols["ᐅᐊLEFT"]=".outer_left(%s)"
symbols["ᐅᐊRIGHT"]=".outer_right(%s)"
symbols["ᐅᐊFULL"]=".outer(%s)"
for i in symbols:
expr=expr.replace(i,"_____%s_____"% (i))