Just a regular commit

diff --git a/filedata.cpp b/filedata.cpp
index c3a88403f8054b4a2469ec13d2280a53201a9405..44b286001114da1fb65ca41de207f188dbd8cc20 100644 (file)
--- a/filedata.cpp
+++ b/filedata.cpp
@@ -8,13 +8,13 @@ FileData::FileData( char               _type,
                     string             _permissions,
                     string             _user,
                     string             _group,
-                    unsigned int       _size,
+                    unsigned long      _size,
                     unsigned long long _modified_date,
                     string             _name )
-: type( _type ),
+: filetype( _type ),
   permissions( _permissions ),
-  user( _user ),
-  group( _group ),
-  size( _size ),
+  username( _user ),
+  groupname( _group ),
+  filesize( _size ),
   modified_date( _modified_date ),
-  name( _name ) {}
+  filename( _name ) {}

diff --git a/filedata.hpp b/filedata.hpp
index 0393ecd69c159ceb4d88ef53e6dfddfe4dd123b6..86e5b0ebf3629137ccdf830b8c1f5591b63550bf 100644 (file)
--- a/filedata.hpp
+++ b/filedata.hpp
@@ -7,7 +7,7 @@ class FileData {
               std::string,
               std::string,
               std::string,
-              unsigned int,
+              unsigned long,
               unsigned long long,
               std::string
               );
@@ -16,11 +16,13 @@ class FileData {
     FileData();
     FileData( const FileData & );
 
-    char               type;
+    char               filetype;
     std::string        permissions;
-    std::string        user;
-    std::string        group;
-    unsigned int       size;
+    std::string        username;
+    std::string        groupname;
+    unsigned long      filesize;
     unsigned long long modified_date;
-    std::string        name;
+    std::string        filename;
+
+    unsigned long long last_backup_date;
 };

diff --git a/main.cc b/main.cc
index b809f589e5d6381e8e8af3251772f27f1ede5e79..dbd96a0c0f56b7fb3b947a3687ff1f43dfe6cb73 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -4,6 +4,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <sqlite3.h>
+
 using namespace std;
 
 vector<string> split( const string &line, char c, int limit = -1 ) {
@@ -25,18 +27,50 @@ 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;
+  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;
-  do {
-    file_string.clear();
-    for( int c = cin.get(); 0 != c && ! cin.eof(); c = cin.get() ) {
-      file_string.push_back( c );
-    }
-    if( 0 != file_string.size() ) {
-      // Example entry
-      // type perms user group size datemodified name (7 total)
-      // f 0600 cnb cnb 424 20051015205340 ./.git/index
-      vector<string> values = split( file_string, ' ', 7 );
-    }
-  } while( ! cin.eof() );
+//   string file_string;
+//   do {
+//     file_string.clear();
+//     for( int c = cin.get(); 0 != c && ! cin.eof(); c = cin.get() ) {
+//       file_string.push_back( c );
+//     }
+//     if( 0 != file_string.size() ) {
+//       // Example entry
+//       // type perms user group size datemodified name (7 total)
+//       // f 0600 cnb cnb 424 20051015205340 ./.git/index
+//       vector<string> values = split( file_string, ' ', 7 );
+//     }
+//   } while( ! cin.eof() );
+
+  sql_experimenting();
 }

diff --git a/schema.sql b/schema.sql
index d1515d9763f1c2819b76201cc4b2546911b6ec6c..42bf81168517fc3ede726c710e89c5e6abeae836 100644 (file)
--- a/schema.sql
+++ b/schema.sql
@@ -1,9 +1,10 @@
-CREATE TABLE file (
-  CHAR type,
-  VARCHAR permissions,
-  VARCHAR user,
-  VARCHAR group,
-  INTEGER size,
-  INTEGER modified_date,
-  VARCHAR name
-)
+CREATE TABLE filedata (
+  filetype         CHAR,
+  permissions      VARCHAR,
+  username         VARCHAR,
+  groupname        VARCHAR,
+  filesize         INTEGER,
+  modified_date    INTEGER, -- e.g. 20051016194000 for Oct 10, 2005 at 7:40pm
+  filename         VARCHAR,
+  last_backup_date INTEGER
+);