(DBInterface): remove deprecated functions

extensions/DBServer-MySQL/test.cc

@@ -55,7 +55,7 @@ int main(int argc, char** argv)
 
 			cout << endl;
 
-			cout << "ID: " << r.as_string(it, "id") << endl;
+			//			cout << "ID: " << r.as_string(it, "id") << endl;
 			cout << "ID: " << it.as_string("id") << endl;
 		}
 

extensions/DBServer-SQLite/test.cc

@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 			//			for( int i=0; i<col.size(); i++ )
 			//				cerr << "[" << i << "]: " << r.getColName(i) << endl;
 
-			cout << "ID: " << r.as_string(it, "id") << endl;
+			//			cout << "ID: " << r.as_string(it, "id") << endl;
 			cout << "date: " << it.as_string("date") << endl;
 		}
 

extensions/LogDB/LogDB.cc

@@ -392,7 +392,7 @@ size_t LogDB::getCountOfRecords( const std::string& logname )
 	if( !ret )
 		return 0;
 
-	return (size_t) DBResult::as_int(ret.begin(), 0);
+	return (size_t) ret.begin().as_int(0);
 }
 //--------------------------------------------------------------------------------------------
 size_t LogDB::getFirstOfOldRecord( size_t maxnum )
@@ -405,7 +405,7 @@ size_t LogDB::getFirstOfOldRecord( size_t maxnum )
 	if( !ret )
 		return 0;
 
-	return (size_t) DBResult::as_int(ret.begin(), 0);
+	return (size_t) ret.begin().as_int(0);
 }
 //--------------------------------------------------------------------------------------------
 std::shared_ptr<LogDB> LogDB::init_logdb( int argc, const char* const* argv, const std::string& prefix )

include/DBInterface.h

@@ -75,16 +75,6 @@ namespace uniset
 			// slow function
 			std::string getColName( int index );
 
-
-			// ======================= DEPRECATED FUNCTIONS ===============================
-			// ROW
-			static int as_int( const DBResult::iterator& it, int col );
-			static double as_double( const DBResult::iterator& it, int col );
-			static std::string as_string( const DBResult::iterator& it, int col );
-
-			int as_int( const DBResult::iterator& it, const std::string& colname );
-			double as_double( const DBResult::iterator& it, const std::string& colname );
-			std::string as_string(const DBResult::iterator& it, const std::string& colname );
 			// ----------------------------------------------------------------------------
 			// COL
 			static int as_int( const DBResult::COL::iterator& it );
@@ -92,17 +82,6 @@ namespace uniset
 			static std::string as_string( const DBResult::COL::iterator& it );
 			static size_t num_cols( const DBResult::iterator& it );
 			// ----------------------------------------------------------------------------
-			// =====      END OF DEPRECATED FUNCTIONS    =====
-			// ----------------------------------------------------------------------------
-			// USE NEW INTERFACE:
-			// ------------------
-			// for( auto it = dbres.begin(); it!= dbres.end(); ++it )
-			//     cout << it.as_string("field_name") << endl;
-			// OR
-			//     cout << it.as_string(index) << endl;
-			//
-			// available functions: as_string(), as_int(), as_double()
-			// ----------------------------------------------------------------------------
 
 		protected:
 

src/Services/DBInterface.cc

@@ -79,36 +79,36 @@ namespace uniset
 		return row_.empty();
 	}
 	// ----------------------------------------------------------------------------
-	int DBResult::as_int( const DBResult::iterator& it, int col )
-	{
-		return it.as_int(col);
-	}
-	// ----------------------------------------------------------------------------
-	double DBResult::as_double( const DBResult::iterator& it, int col )
-	{
-		return it.as_double(col);
-	}
-	// ----------------------------------------------------------------------------
-	std::string DBResult::as_string( const DBResult::iterator& it, int col )
-	{
-		return it.as_string(col);
-	}
-
-	int DBResult::as_int( const DBResult::iterator& it, const std::string& cname )
-	{
-		return it.as_int(cname);
-	}
-
-	double DBResult::as_double(const DBResult::iterator& it, const std::string& cname)
-	{
-		return it.as_double(cname);
-	}
-
-	std::string DBResult::as_string( const DBResult::iterator& it, const std::string& cname )
-	{
-		return it.as_string(cname);
-	}
-	// ----------------------------------------------------------------------------
+	//	int DBResult::as_int( const DBResult::iterator& it, int col )
+	//	{
+	//		return it.as_int(col);
+	//	}
+	//	// ----------------------------------------------------------------------------
+	//	double DBResult::as_double( const DBResult::iterator& it, int col )
+	//	{
+	//		return it.as_double(col);
+	//	}
+	//	// ----------------------------------------------------------------------------
+	//	std::string DBResult::as_string( const DBResult::iterator& it, int col )
+	//	{
+	//		return it.as_string(col);
+	//	}
+
+	//	int DBResult::as_int( const DBResult::iterator& it, const std::string& cname )
+	//	{
+	//		return it.as_int(cname);
+	//	}
+
+	//	double DBResult::as_double(const DBResult::iterator& it, const std::string& cname)
+	//	{
+	//		return it.as_double(cname);
+	//	}
+
+	//	std::string DBResult::as_string( const DBResult::iterator& it, const std::string& cname )
+	//	{
+	//		return it.as_string(cname);
+	//	}
+	//	// ----------------------------------------------------------------------------
 	size_t DBResult::num_cols( const DBResult::iterator& it )
 	{
 		return it.num_cols();