From 262ba10443f4eb19c79aeb5f8daf23354f300372 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Mon, 5 Jul 2010 15:21:06 +0000
Subject: [PATCH] small refactoring

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@619 e52654a7-88a9-db11-a3e9-0013d4bc506e
---
 core/functionparser.cpp |  7 ++++++-
 templates/ls.cpp        | 18 +++--------------
 templates/misc.cpp      | 43 ++++++++++++++++++-----------------------
 templates/misc.h        |  3 +--
 templates/upload.cpp    | 16 ++-------------
 5 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/core/functionparser.cpp b/core/functionparser.cpp
index 14d7d07..f9fd058 100755
--- a/core/functionparser.cpp
+++ b/core/functionparser.cpp
@@ -145,7 +145,12 @@ size_t i;
 
 	request.param_table.push_back(param);
 
-	log << log3 << "FP: Param: name=" << param.name << ", value=" << param.value << logend;
+	log << log3 << "FP: Param: name=" << param.name;
+	
+	if( !param.value.empty() )
+		log << ", value=" << param.value;
+
+	log << logend;
 }
 
 
diff --git a/templates/ls.cpp b/templates/ls.cpp
index 8eb15ce..f503f0b 100755
--- a/templates/ls.cpp
+++ b/templates/ls.cpp
@@ -9,6 +9,7 @@
  
 #include "templates.h"
 #include "../core/request.h"
+#include "misc.h"
 
 
 
@@ -25,21 +26,8 @@ void ls_ckeditor_funnum_browse(Info & i)
 {
 	if( ls_ckeditor_reqid != request.id )
 	{
-		ls_ckeditor_reqid = request.id;
-		ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
-
-		if( !request.get_table.empty() )
-		{
-			size_t last = request.get_table.size()-1;
-
-			if( !request.get_table[last].empty() ) 
-			{
-				const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
-				ckeditor_getparser.Parse(str);
-			}
-		}
-
-		ls_ckeditor_funnum = ckeditor_getparser.fun_num;
+		ls_ckeditor_reqid  = request.id;
+		ls_ckeditor_funnum = ParseCKeditorFun();
 	}
 
 	i.out << ls_ckeditor_funnum;
diff --git a/templates/misc.cpp b/templates/misc.cpp
index 22c3920..9670819 100755
--- a/templates/misc.cpp
+++ b/templates/misc.cpp
@@ -36,13 +36,30 @@ void print_date_nice(Ezc::Info & i, const tm * ptm)
 
 
 
+int ParseCKeditorFun()
+{
+	ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
+
+	if( !request.get_table.empty() )
+	{
+		size_t last = request.get_table.size()-1;
+
+		if( !request.get_table[last].empty() ) 
+		{
+			const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
+			ckeditor_getparser.Parse(str);
+		}
+	}
+
+return ckeditor_getparser.fun_num;
+}
+
+
 
 
 // those functions from here are used in the second thread too
 
 
-
-
 void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white)
 {
 	size_t i;
@@ -79,28 +96,6 @@ size_t loc, pat;
 }
 
 
-
-int ParseCKeditorFun()
-{
-	ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
-
-	if( !request.get_table.empty() )
-	{
-		size_t last = request.get_table.size()-1;
-
-		if( !request.get_table[last].empty() ) 
-		{
-			const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
-			ckeditor_getparser.Parse(str);
-		}
-	}
-
-return ckeditor_getparser.fun_num;
-}
-
-
-
-
 } // namespace TemplatesFunctions
 
 
diff --git a/templates/misc.h b/templates/misc.h
index 6e37ed3..170973d 100755
--- a/templates/misc.h
+++ b/templates/misc.h
@@ -24,9 +24,8 @@ namespace TemplatesFunctions
 // table: [language][file]
 typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
 
-
 void print_date_nice(Ezc::Info & i, const tm * ptm);
-
+int ParseCKeditorFun();
 
 
 // those functions from here are used in the second thread too
diff --git a/templates/upload.cpp b/templates/upload.cpp
index 5c5487e..9e27b64 100755
--- a/templates/upload.cpp
+++ b/templates/upload.cpp
@@ -10,6 +10,7 @@
 #include <ctime>
 #include "templates.h"
 #include "../core/request.h"
+#include "misc.h"
 
 
 namespace TemplatesFunctions
@@ -25,20 +26,7 @@ void upload_ckeditor_funnum(Info & i)
 	if( upload_ckeditor_reqid != request.id )
 	{
 		upload_ckeditor_reqid = request.id;
-		ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
-
-		if( !request.get_table.empty() )
-		{
-			size_t last = request.get_table.size()-1;
-
-			if( !request.get_table[last].empty() ) 
-			{
-				const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
-				ckeditor_getparser.Parse(str);
-			}
-		}
-
-		upload_fun_num = ckeditor_getparser.fun_num;
+		upload_fun_num = ParseCKeditorFun();
 	}
 
 	i.out << upload_fun_num;