--- smsdaemon/util.cpp	2008/06/10 22:22:19	42
+++ smsdaemon/util.cpp	2008/06/14 08:39:40	78
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <fstream>
 #include <iconv.h>
-
+#include <stdexcept>
 #include <time.h>
 
 #include "util.h"
@@ -53,13 +53,16 @@
 		return str;
 	}
 
-	
+	bool my_isspace(char ch)
+	{
+		return (isspace(ch) || ch == 0);
+	}
 
 	string str_trim(string str)
 	{
-		while (str.length() > 0 && isspace(str.at(0)))
+		while (str.length() > 0 && my_isspace(str.at(0)))
 			str.erase(0,1);
-		while (str.length() > 0 && isspace(str.at(str.length()-1)))
+		while (str.length() > 0 && my_isspace(str.at(str.length()-1)))
 			str.erase(str.length()-1,1);
 		return str;
 	}
@@ -101,6 +104,34 @@
 		return retval;
 	}
 
+
+    string str_toupper(string str)
+	{
+		for (unsigned i=0; i<str.length(); ++i)
+		{
+			str.replace(i, 1 ,1, ::toupper(str.at(i)));
+		}
+		return str;
+	}
+
+	string str_tolower(string str)
+	{
+		for (unsigned i=0; i<str.length(); ++i)
+		{
+			str.replace(i, 1 ,1, ::tolower(str.at(i)));
+		}
+		return str;
+	}
+
+
+	string str_formatint(int i)
+	{
+		std::ostringstream os;
+		os << i;
+		return os.str();
+	}
+
+
 	string str_characters(string str)
 	{
 		string rep;
@@ -127,7 +158,7 @@
 	}
 
 
-	string str_gsm2latin1(string str)
+	string str_gsm2latin(string str)
 	{
 		str = str_replace_char(str, 0x1c, 198); //AE
 		str = str_replace_char(str, 0x0b, 216); //OE
@@ -139,14 +170,28 @@
 		return str;
 	}
 
+	string str_latin2gsm(string str)
+	{
+		str = str_replace_char(str, 198, 0x1c); //AE
+		str = str_replace_char(str, 216, 0x0b); //OE
+		str = str_replace_char(str, 197, 0x0e); //AA
+
+		str = str_replace_char(str, 230, 0x1d); //ae
+		str = str_replace_char(str, 248, 0x0c); //oe
+		str = str_replace_char(str, 229, 0x0f); //aa
+		return str;
+	}
+
 	string readUrl(string url, string tempfile)
 	{
 		char buf[128000];
 		string document;
 		
 		ostringstream command;
-		command << "wget -O " << tempfile << " -o /dev/null \"" << url << "\"";
-		system( command.str().c_str() );
+		command << "wget -O " << tempfile << " --tries=1 --timeout=15 -o /dev/null  \"" << url << "\"";
+		int res = system( command.str().c_str() );
+		if (res)
+			throw std::runtime_error("Command time out");
 
 		ifstream in( tempfile.c_str() );