removing from top level dir. in favor of monitor/ module dir.

diff --git a/database.py b/database.py
deleted file mode 100644 (file)
index b9fc10d..0000000
--- a/database.py
+++ /dev/null
@@ -1,153 +0,0 @@
-import os
-import sys
-import pickle
-noserial=False
-try:
-       from util.PHPSerialize import *
-       from util.PHPUnserialize import *
-except:
-       #print >>sys.stderr, "PHPSerial db type not allowed."
-       noserial=True
-
-import inspect
-import shutil
-import config
-
-DEBUG= 0
-PICKLE_PATH=config.MONITOR_DATA_ROOT
-
-
-def dbLoad(name, type=None):
-       return SPickle().load(name, type)
-
-def dbExists(name, type=None):
-       #if self.config.debug:
-       #       name = "debug.%s" % name
-       return SPickle().exists(name, type)
-
-def dbDump(name, obj=None, type=None):
-       # depth of the dump is 2 now, since we're redirecting to '.dump'
-       return SPickle().dump(name, obj, type, 2)
-
-def if_cached_else_refresh(cond, refresh, name, function, type=None):
-       s = SPickle()
-       if refresh:
-               if not config.debug and s.exists("production.%s" % name, type):
-                       s.remove("production.%s" % name, type)
-               if config.debug and s.exists("debug.%s" % name, type):
-                       s.remove("debug.%s" % name, type)
-
-       return if_cached_else(cond, name, function, type)
-
-def if_cached_else(cond, name, function, type=None):
-       s = SPickle()
-       if (cond and s.exists("production.%s" % name, type)) or \
-          (cond and config.debug and s.exists("debug.%s" % name, type)):
-               o = s.load(name, type)
-       else:
-               o = function()
-               if cond:
-                       s.dump(name, o, type)   # cache the object using 'name'
-                       o = s.load(name, type)
-               # TODO: what if 'o' hasn't been converted...
-       return o
-
-class SPickle:
-       def __init__(self, path=PICKLE_PATH):
-               self.path = path
-
-       def if_cached_else(self, cond, name, function, type=None):
-               if cond and self.exists("production.%s" % name, type):
-                       o = self.load(name, type)
-               else:
-                       o = function()
-                       if cond:
-                               self.dump(name, o, type)        # cache the object using 'name'
-               return o
-
-       def __file(self, name, type=None):
-               if type == None:
-                       return "%s/%s.pkl" % (self.path, name)
-               else:
-                       if noserial:
-                               raise Exception("No PHPSerializer module available")
-
-                       return "%s/%s.phpserial" % (self.path, name)
-               
-       def exists(self, name, type=None):
-               return os.path.exists(self.__file(name, type))
-
-       def remove(self, name, type=None):
-               return os.remove(self.__file(name, type))
-
-       def load(self, name, type=None):
-               """ 
-               In debug mode, we should fail if neither file exists.
-                       if the debug file exists, reset name
-                       elif the original file exists, make a copy, reset name
-                       else neither exist, raise an error
-               Otherwise, it's normal mode, if the file doesn't exist, raise error
-               Load the file
-               """
-
-               if config.debug:
-                       if self.exists("debug.%s" % name, type):
-                               name = "debug.%s" % name
-                       elif self.exists("production.%s" % name, type):
-                               debugname = "debug.%s" % name
-                               if not self.exists(debugname, type):
-                                       name = "production.%s" % name
-                                       shutil.copyfile(self.__file(name, type), self.__file(debugname, type))
-                               name = debugname
-                       else:   # neither exist
-                               raise Exception, "No such pickle based on %s" % self.__file("debug.%s" % name, type)
-               else:
-                       if   self.exists("production.%s" % name, type):
-                               name = "production.%s" % name
-                       elif self.exists(name, type):
-                               name = name
-                       else:
-                               raise Exception, "No such file %s" % name
-                               
-
-               #import traceback
-               #print traceback.print_stack()
-               #print "loading %s" % self.__file(name, type)
-               #sys.stderr.write("-----------------------------\n")
-               f = open(self.__file(name, type), 'r')
-               if type == None:
-                       o = pickle.load(f)
-               else:
-                       if noserial:
-                               raise Exception("No PHPSerializer module available")
-                       s = PHPUnserialize()
-                       o = s.unserialize(f.read())
-               f.close()
-               return o
-                       
-       
-       # use the environment to extract the data associated with the local
-       # variable 'name'
-       def dump(self, name, obj=None, type=None, depth=1):
-               if obj == None:
-                       o = inspect.getouterframes(inspect.currentframe())
-                       up1 = o[depth][0] # get the frame one prior to (up from) this frame
-                       argvals = inspect.getargvalues(up1)
-                       # TODO: check that 'name' is a local variable; otherwise this would fail.
-                       obj = argvals[3][name] # extract the local variable name 'name'
-               if not os.path.isdir("%s/" % self.path):
-                       os.mkdir("%s" % self.path)
-               if config.debug:
-                       name = "debug.%s" % name
-               else:
-                       name = "production.%s" % name
-               f = open(self.__file(name, type), 'w')
-               if type == None:
-                       pickle.dump(obj, f)
-               else:
-                       if noserial:
-                               raise Exception("No PHPSerializer module available")
-                       s = PHPSerialize()
-                       f.write(s.serialize(obj))
-               f.close()
-               return