Changeset 8

Timestamp:

10/09/04 18:01:37

Author:

fumanchu

Message:

codewalk and logic are now modules in dejavu

Files:

• trunk/__init__.py (modified) (3 diffs)
• trunk/codewalk.py (added)
• trunk/engines.py (modified) (1 diff)
• trunk/logic.py (added)
• trunk/storage/__init__.py (modified) (1 diff)
• trunk/storage/storeado.py (modified) (11 diffs)
• trunk/storage/storeodbc.py (modified) (3 diffs)
• trunk/storage/test_storeado.py (modified) (3 diffs)
• trunk/storage/test_storeodbc.py (modified) (2 diffs)
• trunk/test_codewalk.py (added)
• trunk/test_logic.py (added)

trunk/__init__.py

@@ -1 +1 @@
-import ConfigParser
-import containers
-logic
+datetime
-import xray
-
-from dejavu.analysis import *
-from dejavu.readme import *
+from dejavu import logic
-
-
@@ -425 +426 @@
-# Otherwise, you should create your own instance
-# per application.
-
+dejavu
-
-def _synapses_func(key, farClass, farKey):
@@ -729 +730 @@
-    pass
-
+
+###########################################################################
+##                                                                       ##
+##                           Logic functions                             ##
+##                                                                       ##
+###########################################################################
+
+
+def icontains(a, b):
+    """Case-insensitive test b in a. Note the operand order."""
+    if a is None or b is None:
+        return False
+    return b.lower() in a.lower()
+
+def icontainedby(a, b):
+    """Case-insensitive test a in b. Note the operand order."""
+    if a is None or b is None:
+        return False
+    return a.lower() in b.lower()
+
+def istartswith(a, b):
+    """True if a starts with b (case-insensitive), False otherwise."""
+    if a is None or b is None:
+        return False
+    return a.lower().startswith(b.lower())
+
+def iendswith(a, b):
+    """True if a ends with b (case-insensitive), False otherwise."""
+    if a is None or b is None:
+        return False
+    return a.lower().endswith(b.lower())
+
+def ieq(a, b):
+    """True if a == b (case-insensitive), False otherwise."""
+    if a is None or b is None:
+        return False
+    return (a.lower() == b.lower())
+
+def year(value):
+    """The year attribute of a date."""
+    if isinstance(value, (datetime.date, datetime.datetime)):
+        return value.year
+    else:
+        return None
+
+def now():
+    """Late-bound datetime.datetime.now(). Taint this when early binding."""
+    return datetime.datetime.now()
+now.bind_late = True
+
+def today():
+    """Late-bound datetime.date.today(). Taint this when early binding."""
+    return datetime.date.today()
+today.bind_late = True
+
+def iscurrentweek(value):
+    """If value is in the current week, return True, else False."""
+    if isinstance(value, (datetime.date, datetime.datetime)):
+        return datetime.date.today().strftime('%W%Y') == value.strftime('%W%Y')
+    else:
+        return False
+iscurrentweek.bind_late = True

trunk/engines.py

@@ -14 +14 @@
-    import pickle
-import dejavu
-
+from dejavu 
-import sets
-import xray

trunk/storage/__init__.py

@@ -280 +280 @@
-            lock.release()
-
+
+class Adapter(object):
+    """Transform values according to their type."""
+    
+    def __init__(self):
+        self.default_processor = unicode
+        self.processors = {}
+    
+    def coerce(self, value, valuetype=None):
+        if valuetype is None:
+            valuetype = type(value)
+        xform = self.processors.get(valuetype, self.default_processor)
+        return xform(value)
+

trunk/storage/storeado.py

@@ -8 +8 @@
-import pythoncom
-import threading
-import codewalk
-import datetime
-try:
@@ -15 +14 @@
-    import pickle
-import recur
-
-
-
-
+
+
+
+, codewalk, logic
-
-adOpenForwardOnly = 0
@@ -44 +43 @@
-def time_from_com(com_date):
-    """Return a valid (day, datetime.time) from a COM date or time object."""
-
-, sec = divmod(min
+s
+s, sec = divmod(mins
-    # Must do both int() and round() or we'll be up to 1 second off.
-    hour = int(round(hour))
- = int(round(min
+s = int(round(mins
-    sec = int(round(sec))
-
-
-
-logic
+s
+
+
+storage
-    """Coerce incoming values from ADO to Dejavu datatypes."""
-    def __init__(self, unit=None):
@@ -172 +171 @@
-
-
-logic
+storage
-    """Coerce outgoing values from Dejavu datatypes to ADO.Field types."""
-    
@@ -221 +220 @@
-
-
-logic
+storage
-    """Coerce Expression constants to ADO SQL."""
-    
@@ -300 +299 @@
-    
-    sql_cmp_op = ('<', '<=', '=', '!=', '>', '>=', 'in', 'not in')
-logic
-logic
-logic
-logic
-logic
-logic
-logic
-logic
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
-                 }
-    
@@ -332 +331 @@
-            term, operation = terms.pop()
-            # All this checking of None is done so that a function
-logic
+dejavu
-            # all Units (which match the rest of the Expression)
-            # will be recalled. They can then be compared in
@@ -359 +358 @@
-        # Some constants are function or class objects,
-        # which should not be coerced.
-new.function
+FunctionType
-        if not isinstance(val, no_coerce):
-            val = self.adapter.coerce(val)
@@ -686 +685 @@
-        if not path: return firstcls.__name__
-        
-
-
-
+s
+s
+s
-        leftkey, rightkey = firstcls._associations[cls]
-        params = {u'prefix': u'djv',
@@ -696 +695 @@
-                  u'rightkey': rightkey,
-                  }
-
+s
-            params[u'child'] = u"[%(prefix)s%(right)s]" % params
-        else:
-
+s
-        
-        return (u"[%(prefix)s%(left)s] LEFT JOIN %(child)s"
@@ -1008 +1007 @@
-class ADOSQLDecompiler_MSAccess(ADOSQLDecompiler):
-    sql_cmp_op = ('<', '<=', '=', '<>', '>', '>=', 'in', 'not in')
-logic
-logic
-logic
-logic
-logic
-logic
-logic
-logic
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
-                 }
-

trunk/storage/storeodbc.py

@@ -4 +4 @@
-
-import fixedpoint
-import codewalk
-import datetime
-import pickle
-import logic
-import dbi, odbc
-
-import dejavu
-
-
-
-logic
+, codewalk
+
+
+storage
-    """Transform incoming values from ODBC to Dejavu datatypes."""
-    
@@ -91 +89 @@
-
-
-logic
+storage
-    """Transform Expression values according to their type for ODBC SQL."""
-    
@@ -154 +152 @@
-    
-    sql_cmp_op = ('<', '<=', '=', '<>', '>', '>=', 'in', 'not in')
-logic
-logic
-logic
-logic
-logic
+dejavu
+dejavu
+dejavu
+dejavu
+dejavu
-                 }
-    

trunk/storage/test_storeado.py

@@ -5 +5 @@
-import storeado
-import dejavu
-
+from dejavu 
-
-arena = dejavu.Arena()
@@ -55 +55 @@
-        
-        # Test now(), today(), year()
-logic
+dejavu
-            u"SELECT * FROM [djvThings] WHERE [djvThings].[FirstDate] > DateValue(Now())", False)
-logic
+dejavu
-            u"SELECT * FROM [djvThings] WHERE [djvThings].[Event] = Now()", False)
-logic
+dejavu
-            u"SELECT * FROM [djvThings] WHERE Year([djvThings].[Event]) = 2004", False)
-##        
@@ -167 +167 @@
-        
-        # logic and other functions
-logic
-logic
-logic
+dejavu
+dejavu
+dejavu
-              u"[djvThings].[Name] in ('Johann', 'Gambolputty', 'de von Ausfern')", False)
-        reqZip = '92104'

trunk/storage/test_storeodbc.py

@@ -4 +4 @@
-import datetime
-import dejavu
-import logic
-import dbi
-
+, logic
-
-
@@ -137 +136 @@
-        
-        # logic functions
-logic
-logic
-logic
+dejavu
+dejavu
+dejavu
-              u"[Name] in ('Johann', 'Gambolputty', 'de von Ausfern')", False)
-