From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Mon, 24 Nov 2014 23:52:33 +0000 (+0100)
Subject: - Remove debugging messages
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=7e0bccc6ababf82535e45d2dd730b3f62f11e9be;p=Nine-Q.git

- Remove debugging messages
- Set session timeout back to 30 minutes
---

diff --git a/src/handlers/handler_check_answer.adb b/src/handlers/handler_check_answer.adb
index 386f121..168e518 100644
--- a/src/handlers/handler_check_answer.adb
+++ b/src/handlers/handler_check_answer.adb
@@ -23,8 +23,6 @@ package body Handler_Check_Answer is
     UID: Unique_ID;
     HTML: HTML_Code;
   begin
-    Ada.Text_IO.Put_Line("Handling /check_answer");
-
     case Req_Type is
       when AWS.Status.POST =>
 	declare
diff --git a/src/handlers/handler_start.adb b/src/handlers/handler_start.adb
index 976b640..bda113c 100644
--- a/src/handlers/handler_start.adb
+++ b/src/handlers/handler_start.adb
@@ -18,7 +18,6 @@ package body Handler_Start is
     Raw_UID: constant String := AWS.Session.Get(SID, "UID");
     HTML: HTML_Code;
   begin
-    --Ada.Text_IO.Put_Line("Handling /start");
 
     case Req_Type is
       when AWS.Status.GET =>
diff --git a/src/nine_q.adb b/src/nine_q.adb
index 688f18f..3063221 100644
--- a/src/nine_q.adb
+++ b/src/nine_q.adb
@@ -15,8 +15,8 @@ begin
   AWS.Config.Set.Server_Host(Server_Config, "localhost");
   AWS.Config.Set.Server_Port(Server_Config, 18400);
 
-  AWS.Config.Set.Session_Lifetime(90.0);
-  AWS.Config.Set.Session_Cleanup_Interval(180.0);
+  AWS.Config.Set.Session_Lifetime(1800.0);
+  AWS.Config.Set.Session_Cleanup_Interval(3600.0);
 
   Ada.Text_IO.Put_Line("Starting server...");
   AWS.Server.Start(Web_Server => Web_Server,
diff --git a/src/problem_generators/problem_generator-acidobazic_suite.adb b/src/problem_generators/problem_generator-acidobazic_suite.adb
index 21f6c3b..e174066 100644
--- a/src/problem_generators/problem_generator-acidobazic_suite.adb
+++ b/src/problem_generators/problem_generator-acidobazic_suite.adb
@@ -62,7 +62,6 @@ package body Acidobazic_Suite is
     declare
       Simplification_Str: constant String := Answer.Element(ANSWER_SIMPLIFICATION_KEY);
     begin
-      Ada.Text_IO.Put_Line("SS : " & Simplification_Str & " SI : " & Simplification'Image(Problem.Simpl));
       if Simplification_Str /= Simplification'Image(Problem.Simpl) then
 	Message := To_UB_Text("Nesprávné zanedbání");
 	return Wrong_Answer;
@@ -276,7 +275,6 @@ package body Acidobazic_Suite is
       Min := Correct_Up(Min);
     end if;
     Max := Correct_Down(Max);
-    --Ada.Text_IO.Put_Line("Min: " & pH_Float'Image(Min) & " Max: " & pH_Float'Image(Max) & " Simpl: " & Simplification'Image(S));
   end Calculate_Concentration_Limits;
 
   function Calculate_Solution(Problem: in Acidobazic_Problem) return pH_Float is
@@ -287,24 +285,12 @@ package body Acidobazic_Suite is
     use pH_Float_IO;
     use Ada.Text_IO;
   begin
-    -- DEBUG Dump
-    --Put("* Kx = "); Put(Problem.Kx);
-    --Put(" | cX = "); Put(Problem.cX);
-    --case Problem.Subst_Type is
-    --  when Acid =>
-    --	Put_Line(" | ACID");
-    --  when Base =>
-    --	Put_Line(" | BASE");
-    -- end case;
-    -- END DEBUG Dump
-
     case Problem.Simpl is
       -- We are ignoring everything
       when Both =>
 	declare
 	  pH: constant pH_Float := X_To_pX(Sqrt(Problem.Kx * Problem.cX));
 	begin
-	  --Ada.Text_IO.Put_Line("Both simplifications");
 	  case Problem.Subst_Type is
 	    when Acid =>
 	      return pH;
@@ -320,7 +306,6 @@ package body Acidobazic_Suite is
 	  X_2: pH_Float;
 	  pH: pH_Float;
 	begin
-	  --Ada.Text_IO.Put_Line("Taking only dissociation into account");
 	  -- Solve the quadratic equation
 	  D := (Problem.Kx ** 2.0) + (4.0 * Problem.Kx * Problem.cX);
 	  if D < 0.0 then
@@ -341,7 +326,6 @@ package body Acidobazic_Suite is
 	declare
 	  pH: constant pH_Float := X_To_pX(Sqrt(Problem.Kx * Problem.cX + K_W));
 	begin
-	  --Ada.Text_IO.Put_Line("Taking only autoprotolysis into account");
 	  case Problem.Subst_Type is
 	    when Acid =>
 	      return pH;
diff --git a/src/problem_generators/problem_generator-solubility_suite.adb b/src/problem_generators/problem_generator-solubility_suite.adb
index a7db203..e0fe220 100644
--- a/src/problem_generators/problem_generator-solubility_suite.adb
+++ b/src/problem_generators/problem_generator-solubility_suite.adb
@@ -380,7 +380,6 @@ package body Solubility_Suite is
 	GM := Calculate_Activity_Coefficient(Prob_Data.N, I);
 	GN := Calculate_Activity_Coefficient(Prob_Data.M, I);
 
-	Ada.Text_IO.Put_Line("IS, AC");
 	SS_IO.Put(I); Ada.Text_IO.New_Line;
 	SS_IO.Put(GM); Ada.Text_IO.New_Line;
 	SS_IO.Put(GN); Ada.Text_IO.New_Line;
diff --git a/src/problem_manager.adb b/src/problem_manager.adb
index 34dd950..c517b77 100644
--- a/src/problem_manager.adb
+++ b/src/problem_manager.adb
@@ -113,7 +113,6 @@ package body Problem_Manager is
     -- Initialize problem
     if Parameters.Is_Empty = False then
       Success := Problem.Set_Parameters(Parameters);
-      Ada.Text_IO.Put_Line("Setting problem parameters");
       if Success = False then
 	Free_Chem_Problem(Problem);
 	return False;