diff src/db.cpp @ 8:4967d1e2b30c

Alert when not mask in batch print mode.
author pyon@macmini
date Fri, 01 Nov 2013 18:44:37 +0900
parents 7ac7d28699af
children b455f2d8aac9
line wrap: on
line diff
--- a/src/db.cpp	Thu Oct 17 19:54:23 2013 +0900
+++ b/src/db.cpp	Fri Nov 01 18:44:37 2013 +0900
@@ -1,5 +1,5 @@
 // Filename   : db.cpp
-// Last Change: 16-Oct-2013.
+// Last Change: 01-Nov-2013.
 //
 
 #include "db.h"
@@ -197,7 +197,7 @@
 }
 
 /* インデックスを更新 */
-void UpdateIndex( wxString datedir, wxString date )
+void UpdateIndex( wxString datadir, wxString date )
 {
     wxString gszFile = wxGetCwd() + wxFILE_SEP_PATH + wxT("db") + wxFILE_SEP_PATH + wxT("ccn.db");
     wxSQLite3Database ccndb;
@@ -209,7 +209,7 @@
     stmt.Finalize();
 
     wxString ccndir;
-    wxDir dated( datedir );
+    wxDir dated( datadir );
     if ( !dated.IsOpened() ) {
         return;
     }
@@ -223,7 +223,7 @@
 
     while ( cont ) {
 
-        wxDir ccnd( datedir + wxFILE_SEP_PATH + ccndir );
+        wxDir ccnd( datadir + wxFILE_SEP_PATH + ccndir );
         if ( !ccnd.IsOpened() ) return;
         wxString hhsdir;
         bool c = ccnd.GetFirst( &hhsdir, wxEmptyString, wxDIR_DIRS );
@@ -231,7 +231,7 @@
         while ( c ) {
             if ( ! reSinsei.Matches( hhsdir ) ) {
 
-                wxString path = datedir + wxFILE_SEP_PATH + ccndir + wxFILE_SEP_PATH + hhsdir;
+                wxString path = datadir + wxFILE_SEP_PATH + ccndir + wxFILE_SEP_PATH + hhsdir;
 
                 stmt = ccndb.PrepareStatement( "INSERT INTO path VALUES( ?, ?, ?, datetime( 'now', 'localtime' ) );" );
                 stmt.Bind( 1, hhsdir );