X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FDate.cc;h=6e8fdb6250b3d7e101a2e760cf176349a7cc52eb;hb=6dea0b59503a71874c4476c05044fff3c5ae26a5;hp=e82ee999edc8dad3c321c7de7cda3d54558ec974;hpb=c4d8504b99fa1e354d15b2b91e4e2797f54ba028;p=lib1wire.git

diff --git a/src/Date.cc b/src/Date.cc
index e82ee99..6e8fdb6 100644
--- a/src/Date.cc
+++ b/src/Date.cc
@@ -70,29 +70,29 @@ void Date::printout() {
 Date *Date::clone() {
 	Date	*ret_val;
 
-	ret_val	= new Date(this->year,
-			this->month,
-			this->day,
-			this->hour,
-			this->min,
-			this->sec);
+	ret_val	= new Date(year,
+			month,
+			day,
+			hour,
+			min,
+			sec);
 	return ret_val;
 }
 
 void Date::copy(Date *date) {
-	this->year	= date->year;
-	this->month	= date->month;
-	this->day	= date->day;
-	this->hour	= date->hour;
-	this->min	= date->min;
-	this->sec	= date->sec;
+	year	= date->year;
+	month	= date->month;
+	day	= date->day;
+	hour	= date->hour;
+	min	= date->min;
+	sec	= date->sec;
 }
 
 bool Date::before(Date date2) {
 	bool	ret_val;
-	string s1 = this->to_string();
-	string s2 = date2.to_string();
 
+	string s1 = this->to_sortable_string();
+	string s2 = date2.to_sortable_string();
 	ret_val	= false;
 	if (s1.compare(s2) < 0) {
 		ret_val	= true;
@@ -191,7 +191,7 @@ void Date::inc_seconds(int seconds) {
 	}
 }
 
-string Date::to_string() {
+string Date::to_sortable_string() {
 	char 	buffer[30];
 	string	ret_val;
 
@@ -199,3 +199,12 @@ string Date::to_string() {
 	ret_val	= buffer;
 	return ret_val;
 }
+
+string Date::to_string() {
+	char 	buffer[30];
+	string	ret_val;
+
+	sprintf(buffer, "%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, min, sec);
+	ret_val	= buffer;
+	return ret_val;
+}