1 files changed, 17 insertions, 17 deletions

diff --git a/server/src/pracrodaopgsql.cc b/server/src/pracrodaopgsql.cc
index aa1c8bd..6f4d659 100644
--- a/server/src/pracrodaopgsql.cc
+++ b/server/src/pracrodaopgsql.cc
@@ -46,7 +46,7 @@
 #include <list>
 #include <sstream>
 
-#include "debug.h"
+#include <hugin.hpp>
 
 #include "pgwork.h"
 
@@ -66,7 +66,7 @@ PracroDAOPgsql::PracroDAOPgsql(std::string _host, std::string _port,
   conn = PQconnectdb(cs.c_str());
 
   if(conn == NULL || PQstatus(conn) == CONNECTION_BAD)	{
-    ERR_LOG(db, "Postgresql init failed: %s\n", PQerrorMessage(conn));
+    ERR(db, "Postgresql init failed: %s\n", PQerrorMessage(conn));
     conn = NULL;
     return;
   }
@@ -100,7 +100,7 @@ std::string PracroDAOPgsql::newSessionId()
     ERR(db, "Something wrong with the session counter.\n");
 
   } catch(std::exception &e) {
-    ERR_LOG(db, "Session counter failed: %s\n", e.what());
+    ERR(db, "Session counter failed: %s\n", e.what());
   }
 
   return "";
@@ -154,7 +154,7 @@ void PracroDAOPgsql::commitTransaction(std::string sessionid,
       if(ri != R.end()) {
         std::string status = (*ri)[0].c_str();
         if(status == "committed") {
-          ERR_LOG(db, "Attempt to add to committed session %s blocked!\n",
+          ERR(db, "Attempt to add to committed session %s blocked!\n",
                   sessionid.c_str());
           return;
         }
@@ -165,7 +165,7 @@ void PracroDAOPgsql::commitTransaction(std::string sessionid,
       /*result_t R = */W.exec(ts);
     }
   } catch(std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
     return;
   }
 
@@ -229,7 +229,7 @@ void PracroDAOPgsql::commitTransaction(std::string sessionid,
     W.commit();
 
   } catch(std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
   }
 
 }
@@ -391,7 +391,7 @@ Values PracroDAOPgsql::getLatestValues(std::string sessionid,
     }
 #endif/*NEW*/
   } catch (std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), query.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), query.c_str());
   }
 
   return values;
@@ -424,7 +424,7 @@ unsigned PracroDAOPgsql::nrOfCommits(std::string sessionid,
     DEBUG(sql, "Query: %s\n", query.c_str());
     result_t R = W.exec(query);
     if(R.size() != 1) {
-      ERR_LOG(db, "No result set; expected one row with one column\n");
+      ERR(db, "No result set; expected one row with one column\n");
       return 0;
     }
     unsigned n = (unsigned)atol((*R.begin())[0].c_str());
@@ -432,7 +432,7 @@ unsigned PracroDAOPgsql::nrOfCommits(std::string sessionid,
                  n, patientid.c_str(), macroname.c_str(), oldest);
     return n;
   } catch (std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), query.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), query.c_str());
   }
 
   return 0;
@@ -470,7 +470,7 @@ void PracroDAOPgsql::addFieldname(std::string name, std::string description)
     result_t R = W.exec(ts);
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
   }
 }
 
@@ -490,7 +490,7 @@ void PracroDAOPgsql::delFieldname(std::string name)
     result_t R = W.exec(ts);
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), ts.c_str());
   }
 }
 
@@ -519,7 +519,7 @@ std::vector<Fieldname> PracroDAOPgsql::getFieldnames()
       ri++;
     }
   } catch (std::exception &e) {
-    ERR_LOG(db, "Query failed: %s: %s\n", e.what(), query.c_str());
+    ERR(db, "Query failed: %s: %s\n", e.what(), query.c_str());
   }
 
   return fieldnames;
@@ -540,7 +540,7 @@ void PracroDAOPgsql::commit(std::string sessionid)
     
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "Commit failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Commit failed: %s: %s\n", e.what(), ts.c_str());
   }
 }
 
@@ -559,7 +559,7 @@ void PracroDAOPgsql::nocommit(std::string sessionid)
     
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "NoCommit failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "NoCommit failed: %s: %s\n", e.what(), ts.c_str());
   }
 }
 
@@ -577,7 +577,7 @@ void PracroDAOPgsql::discard(std::string sessionid)
     /*result_t R = */W.exec(ts);
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "Abort (rollback) failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "Abort (rollback) failed: %s: %s\n", e.what(), ts.c_str());
   }
 }
 
@@ -598,7 +598,7 @@ bool PracroDAOPgsql::idle(std::string sessionid)
       return status == "idle";
     }
   } catch (std::exception &e) {
-    ERR_LOG(db, "setIdle failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "setIdle failed: %s: %s\n", e.what(), ts.c_str());
   }
 
   return false;
@@ -625,7 +625,7 @@ void PracroDAOPgsql::setIdle(std::string sessionid, bool idle)
     
     W.commit();
   } catch (std::exception &e) {
-    ERR_LOG(db, "setIdle failed: %s: %s\n", e.what(), ts.c_str());
+    ERR(db, "setIdle failed: %s: %s\n", e.what(), ts.c_str());
   }
 
 }