Merge branch 'master' of http://git.aasimon.org/public/pracro

1 files changed, 16 insertions, 2 deletions

diff --git a/server/src/session.h b/server/src/session.h
index 4d1ed12..1cb3041 100644
--- a/server/src/session.h
+++ b/server/src/session.h
@@ -37,6 +37,9 @@
 #include "transaction.h"
 #include "template.h"
 
+#include "luascript.h"
+#include "journal.h"
+
 class Environment;
 class Journal;
 
@@ -50,9 +53,10 @@ public:
   std::string id();
   
   void lock();
+  bool trylock();
   void unlock();
 
-  void commit();
+  void commit() throw(LUAScript::Exception, Journal::Exception);
   void nocommit();
   void discard();
 
@@ -128,7 +132,17 @@ public:
   //
   // Admin methods
   //
-  std::vector<std::string> activeSessions();
+  class SessionInfo {
+  public:
+    std::string id;
+    std::string patientid;
+    std::string user;
+    std::string course;
+    std::string templ;
+    bool idle;
+    bool ondisc;
+  };
+  std::vector<SessionInfo> activeSessions();
 
 private:
   std::map<std::string, Session *> sessions;