- added modules for sqlite3 connection and session handling

- added cookie support


git-svn-id: https://svn.spreadspace.org/mur.sat@74 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 24 insertions, 20 deletions

diff --git a/tools/mmd/MmdCommands.py b/tools/mmd/MmdCommands.py
index 1af9422..5bf870d 100644
--- a/tools/mmd/MmdCommands.py
+++ b/tools/mmd/MmdCommands.py
@@ -1,66 +1,70 @@
 """
-command methods for MURSAT1 Dashboard
+command methods for MURSAT1 Mission Dashboard
 """
 
 from cgi import parse_qs, escape
-from MmdWidgets import *
+from mmd.MmdWidgets import *
 
-def loginForm (data):
+def loginForm (session):
   """
   display the login form
   """
-  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (data['ip']))
+  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (session.session_id, session.user))
 
-def login (data):
+def login (session):
   """
   evaluate data from loginForm
   """
-  email = escape (data['qs'].get ('email', [''])[0])
+  email = escape (session.qs.get ('email', [''])[0])
   # check for account
   # verify password
-  return indexWidget (dataWidget (), loginWidget (email), statusWidget (data['ip'], data['user']))
+  return indexWidget (dataWidget (), loginWidget (email), statusWidget (session.session_id, session.user))
 
-def registerForm (data):
+def registerForm (session):
   """
   display the register form
   """
-  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (data['ip']))
+  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (session.session_id, session.user))
 
-def register (data):
+def register (session):
   """
   evaluate data from registerForm
   """
-  return indexWidget (dataWidget (), loginWidget (), statusWidget (data['ip']))
+  return indexWidget (dataWidget (), registerWidget (), statusWidget (session.session_id, session.user))
 
-def submitForm (data):
+def submitForm (session):
   """
   display the form for data submission
   """
-  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (data['ip'], data['user']))
+  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (session.session_id, session.user))
 
-def submit (data):
+def submit (session):
   """
   evaluate data from submitForm
   """
-  return indexWidget (dataWidget (), submitWidget (), statusWidget (data['ip']))
+  return indexWidget (dataWidget (), submitWidget (), statusWidget (session.session_id, session.user))
 
-def viewlog (data):
+def viewlog (session):
   """
   show latest log entries/submissions
   """
-  return indexWidget (dataWidget (), logWidget (), statusWidget (data['ip'], data['user']))
+  return indexWidget (dataWidget (), logWidget (), statusWidget (session.session_id, session.user))
 
-def index (data):
+def index (session):
   """
   display the index page
   """
-  return indexWidget (dataWidget (), osmWidget (), statusWidget (data['ip'], data['user']))
+  return indexWidget (dataWidget (), osmWidget (), statusWidget (session.session_id, session.user))
 
-def msdbtest (env):
+def mmdtest (env, cookie):
   body = ''
   for key, value in sorted (env.items()):
     body = '{0}{1}: {2}\n'.format (body, key, value)
+  body = '{0}Cookie: {1}\n'.format (body, cookie['mmd'].value)
   return body
 
+if __name__ == "__main__":
+  pass
+
 # vim: tw=0 ts=2 expandtab
 # EOF