initial release of sunlock functionality

4 files changed, 140 insertions, 0 deletions

diff --git a/server/src/macrotool/Makefile.am b/server/src/macrotool/Makefile.am
index 061b904..edd8f4a 100644
--- a/server/src/macrotool/Makefile.am
+++ b/server/src/macrotool/Makefile.am
@@ -14,6 +14,7 @@ macrotool_SOURCES = \
 	fieldnames.cc \
 	fieldnamescanner.cc \
 	filehandler.cc \
+	sunlock.cc \
 	util.cc \
 	../debug.cc \
 	../configuration.cc \
@@ -40,6 +41,7 @@ EXTRA_DIST = \
 	fieldnames.h \
 	fieldnamescanner.h \
 	filehandler.h \
+	sunlock.h \
 	util.h
 
 ################
diff --git a/server/src/macrotool/macrotool.cc b/server/src/macrotool/macrotool.cc
index b811c29..0445927 100644
--- a/server/src/macrotool/macrotool.cc
+++ b/server/src/macrotool/macrotool.cc
@@ -46,6 +46,7 @@
 #include "fieldnames.h"
 #include "filehandler.h"
 #include "export.h"
+#include "sunlock.h"
 
 static const char version_str[] =
 "Pracro server v" VERSION "\n"
@@ -75,6 +76,8 @@ static const char usage_str[] =
 "                       ('fieldnames help' to see list of entities).\n"
 "  filehandler entity  Handle macro files ('filehandler help' to see list of entities).\n"
 "  export entity       Export data from database to comma separated file ('export help' to see list of entities)\n"
+"  sunlock sid         Sets the status of a session id in the database"
+                       " to 'idle'.\n"
 ;
 
 ConfigurationParser *configparser = NULL;
@@ -161,6 +164,7 @@ int main(int argc, char *argv[])
   if(command == "fieldnames") macrotool_fieldnames(params);
   if(command == "filehandler") macrotool_filehandler(params);
   if(command == "export") macrotool_export(params);
+  if(command == "sunlock") macrotool_sunlock(params);
 
   return 0;
 }
diff --git a/server/src/macrotool/sunlock.cc b/server/src/macrotool/sunlock.cc
new file mode 100644
index 0000000..e75e7de
--- /dev/null
+++ b/server/src/macrotool/sunlock.cc
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set et sw=2 ts=2: */
+/***************************************************************************
+ *            sunlock.cc
+ *
+ *  Wed Feb  2 10:28:14 CET 2011
+ *  Copyright 2011 Lars Bisballe Jensen
+ *  elsenator@gmail.com
+ ****************************************************************************/
+
+/*
+ *  This file is part of Pracro.
+ *
+ *  Pracro is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Pracro is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Pracro; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "sunlock.h"
+
+#include <pqxx/pqxx>
+#include <stdio.h>
+
+#include "configuration.h"
+
+static const char usage_str[] =
+"  help        Prints this helptext.\n"
+"  sid         Sets the status of a session id in the database"
+               " to 'idle'.\n"
+;
+
+static void sunlock_uid(std::string uid)
+{
+  if(Conf::database_backend != "pgsql") {
+    printf("ERROR: Sunlock only available for the pgsql database backend.\n");
+    return;
+  }
+
+  std::string host = Conf::database_addr;
+  std::string port = "";//Conf::database_port;
+  std::string user = Conf::database_user;;
+  std::string passwd = Conf::database_passwd;
+  std::string dbname = "";//Conf::database_database;
+
+  std::string cs;
+  if(host.size()) cs += " host=" + host;
+  if(port.size()) cs += " port=" + port;
+  if(user.size()) cs += " user=" + user;
+  if(passwd.size()) cs += " password=" + passwd;
+  cs += " dbname=" + (dbname.size() ? dbname : "pracro");
+
+  pqxx::connection conn(cs);
+  pqxx::work work(conn);
+
+  work.exec("UPDATE COMMITS SET status='idle' WHERE uid="+uid+" AND status='active';");
+  work.commit();
+}
+
+void macrotool_sunlock(std::vector<std::string> params)
+{
+  if(params.size() < 1) {
+    printf("%s", usage_str);
+    return;
+  }
+
+  if(params[0] == "help") {
+    printf("%s", usage_str);
+    return;
+  }
+  
+  sunlock_uid(params[0]);
+}
+
+#ifdef TEST_SUNLOCK
+//Additional dependency files
+//deps:
+//Required cflags (autoconf vars may be used)
+//cflags:
+//Required link options (autoconf vars may be used)
+//libs:
+#include "test.h"
+
+TEST_BEGIN;
+
+// TODO: Put some testcode here (see test.h for usable macros).
+
+TEST_END;
+
+#endif/*TEST_SUNLOCK*/
diff --git a/server/src/macrotool/sunlock.h b/server/src/macrotool/sunlock.h
new file mode 100644
index 0000000..9eca4d6
--- /dev/null
+++ b/server/src/macrotool/sunlock.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set et sw=2 ts=2: */
+/***************************************************************************
+ *            sunlock.h
+ *
+ *  Wed Feb  2 10:28:14 CET 2011
+ *  Copyright 2011 Lars Bisballe Jensen
+ *  elsenator@gmail.com
+ ****************************************************************************/
+
+/*
+ *  This file is part of Pracro.
+ *
+ *  Pracro is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Pracro is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Pracro; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __PRACRO_SUNLOCK_H__
+#define __PRACRO_SUNLOCK_H__
+
+#include <vector>
+#include <string>
+
+void macrotool_sunlock(std::vector<std::string> params);
+
+#endif/*__PRACRO_SUNLOCK_H__*/