[Checkins] SVN: Sandbox/ocql-foliage/src/ marking what's there

[Adam Groszer]

Log message for revision 80021:
  marking what's there

Changed:
  U   Sandbox/ocql-foliage/src/ocql/engine/queryobject.py
  U   Sandbox/ocql-foliage/src/status.txt
  U   Sandbox/ocql-foliage/src/testalgebra.py

-=-
Modified: Sandbox/ocql-foliage/src/ocql/engine/queryobject.py
===================================================================
--- Sandbox/ocql-foliage/src/ocql/engine/queryobject.py	2007-09-25 16:01:01 UTC (rev 80020)
+++ Sandbox/ocql-foliage/src/ocql/engine/queryobject.py	2007-09-25 16:05:55 UTC (rev 80021)
@@ -286,4 +286,10 @@
     def get_operator(self,algebra):
         return algebra.Operator('>=')
 
-# TODO: missing xi{Es} xi{E1..E2} I(Es) K ==, ~==
+# TODO: missing:
+    #xi{Es}
+    #xi{E1..E2}
+    #I(Es)
+    #K
+    #==,
+    #~==

Modified: Sandbox/ocql-foliage/src/status.txt
===================================================================
--- Sandbox/ocql-foliage/src/status.txt	2007-09-25 16:01:01 UTC (rev 80020)
+++ Sandbox/ocql-foliage/src/status.txt	2007-09-25 16:05:55 UTC (rev 80021)
@@ -109,3 +109,61 @@
 Problems:
 
 
+
+QueryObject functions
+=====================
+(# = not implemented yet)
+
+#hasClassWith
+Query
+In
+Alias
+Union
+Differ
+And
+Or
+#Index
+Add
+Mul
+Sub
+Div
+Not
+Count
+#Sum
+#Every
+Some
+#Atmost
+#Atleast
+#Just
+Eq
+Ne
+Lt
+Gt
+Le
+Ge
+#xi{Es}
+#xi{E1..E2}
+#I(Es)
+#K
+#==,
+#~==
+
+Algebra functions
+=================
+(# = not implemented yet)
+
+Empty
+Single
+Union
+Iter
+Select
+Reduce
+#Differ
+#Equal
+Range
+#Index
+Make
+#And
+#Being
+If
+Lambda
\ No newline at end of file

Modified: Sandbox/ocql-foliage/src/testalgebra.py
===================================================================
--- Sandbox/ocql-foliage/src/testalgebra.py	2007-09-25 16:01:01 UTC (rev 80020)
+++ Sandbox/ocql-foliage/src/testalgebra.py	2007-09-25 16:05:55 UTC (rev 80021)
@@ -98,8 +98,8 @@
 
     def compile(self):
         if self.func is Lambda and \
-                self.coll is Collection and \
-                self.func.expr is If:
+            self.coll is Collection and \
+            self.func.expr is If:
             
             # You can place here some specialized code...
             if self.klass == set:
@@ -267,6 +267,7 @@
         self.expr2 = expr2
     
     def compile(self):
+        #TODO: is this 100%?
         return '((%s) and (%s) or (%s))' % (
             self.cond.compile(),
             self.expr1.compile(),