It now reads both stdin and the database

diff --git a/filedata.hpp b/filedata.hpp
index 123ef86fe42453beb4a980a91b77165b5733c155..629f933493bffcc733a44cfbfc5c89d2bc2bef75 100644 (file)
--- a/filedata.hpp
+++ b/filedata.hpp
@@ -2,6 +2,7 @@
 #define FILEDATA_H
 
 #include <string>
+#include <set>
 
 class FileData {
   public:
@@ -45,4 +46,6 @@ class FileDataPtrCmp {
   std::less<std::string> cmp;
 };
 
+typedef std::set<FileData*,FileDataPtrCmp> file_set;
+
 #endif

diff --git a/main.cc b/main.cc
index 8ffd418cc9ec289ae0ab8dc8eaa33dc23ad1ed3c..e07c7ee28c3c70fa0cb9fa1d151fda7c43a05a45 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -1,9 +1,7 @@
 #include <iostream>
 #include <iterator>
-#include <string>
 #include <vector>
 #include <algorithm>
-#include <set>
 
 #include <sqlite3.h>
 
@@ -30,39 +28,22 @@ vector<string> split( const string &line, char c, int limit = -1 ) {
   return out;
 }
 
-int callback( void *NotUsed, int argc, char **argv, char **azColName ) {
-  int i;
-  for( int i = 0; i < argc; ++i ) {
-    cout << azColName[i] << " = " << ( argv[i] ? argv[i] : "NULL" ) << endl;
-  }
-  cout << endl;
+int populate_set( void *files_v, int, char **vals, char ** ) {
+  file_set *files = reinterpret_cast<file_set*>( files_v );
+  files->insert( new FileData( vals[0][0],
+        vals[1],
+        vals[2],
+        vals[3],
+        atoi( vals[4] ),
+        atoi( vals[5] ),
+        vals[6]) );
   return 0;
 }
 
-void sql_experimenting() {
-  sqlite3 *db;
-  char *sqliteErrMsg = 0;
-  int rc;
-
-  const char *dbname = "test.db";
-  rc = sqlite3_open( dbname, &db );
-  if( SQLITE_OK != rc ) {
-    cerr << "Cannot open database: " << dbname << ".  Error message is..." << endl;
-    cerr << sqlite3_errmsg(db) << endl;
-  }
-
-  rc = sqlite3_exec( db, "select * from filedata;", callback, 0, &sqliteErrMsg );
-  if( SQLITE_OK != rc ) {
-    cerr << "Problem with database.  Message is..." << endl;
-    cerr << sqliteErrMsg << endl;
-  }
-
-  sqlite3_close( db );
-}
-
 int main() {
   string file_string;
-  set<FileData*,FileDataPtrCmp> current_files;
+
+  file_set current_files;
 
   // Parse the list of files on stdin
   do {
@@ -85,5 +66,27 @@ int main() {
     }
   } while( ! cin.eof() );
 
-  set<FileData*,FileDataPtrCmp> previous_files;
+  // Get the list of previously backed up files from the database.
+  sqlite3 *db;
+
+  const char *dbname = "test.db";
+  int rc = sqlite3_open( dbname, &db );
+  if( SQLITE_OK != rc ) {
+    cerr << "Cannot open database: " << dbname << ".  Error message is..." << endl;
+    cerr << sqlite3_errmsg(db) << endl;
+  }
+
+  char *sqliteErrMsg = 0;
+  file_set previous_files;
+  rc = sqlite3_exec( db, "select * from filedata;", populate_set, &previous_files, &sqliteErrMsg );
+  if( SQLITE_OK != rc ) {
+    cerr << "Problem with database.  Message is..." << endl;
+    cerr << sqliteErrMsg << endl;
+  }
+
+  sqlite3_close( db );
+
+  for( file_set::iterator i = previous_files.begin(); i != previous_files.end(); ++i ) {
+    cout << (*i)->getFileName() << endl;
+  }
 }