--- a/src/myframe.cpp	Mon Jul 25 05:20:55 2011 +0900
+++ b/src/myframe.cpp	Wed Jul 27 19:01:09 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.cpp
-// Last Change: 22-Jul-2011.
+// Last Change: 27-Jul-2011.
 //
 #include "wx/html/htmprint.h"
 #include "wx/print.h"
@@ -157,13 +157,6 @@
 
 void MyCmdBox::OnCmd( wxCommandEvent& event )
 {
-	wxHtmlWindow *h     = (wxHtmlWindow*)FindWindowById( ID_HTML );
-	wxGrid *g           = (wxGrid*)FindWindowById( ID_CCN );
-    wxSplitterWindow *s = (wxSplitterWindow*)FindWindowById( ID_SPLT );
-	s->ReplaceWindow( h, g );
-    h->Show(true);
-    g->Show(false);
-
 	wxRegEx reHhs(wxT("^0[1238][0-9]{8}$"));	// 1:被保番チェック
 	wxRegEx reCno(wxT("^[0-9]{1,2}$"));         // 2:開くフォルダの番号
 	wxRegEx rePrint(wxT("^\\+$"));              // 3:印刷するフォルダの番号
@@ -448,11 +441,9 @@
 	m_menubar  = new wxMenuBar();
 
 	m_menuFile = new wxMenu();
-    m_menuFile->Append( ID_MUPHHS,  wxT("被保険者DB更新"),       wxT("Update hhs-db") );
-    m_menuFile->Append( ID_MLSCCN,  wxT("インデックス更新一覧"), wxT("List index") );
-    m_menuFile->AppendSeparator(); //----
 	wxMenu *menuMaintain = new wxMenu();
     m_menuFile->AppendSubMenu( menuMaintain,  wxT("メンテナンス") );
+    menuMaintain->Append( ID_MUPHHS,  wxT("被保険者DB更新"),           wxT("Update hhs-db") );
     menuMaintain->Append( ID_MDBBKUP, wxT("データベースバックアップ"), wxT("Backup DBs") );
     menuMaintain->Append( ID_MDBOPT,  wxT("データベース最適化"),       wxT("Optimize DBs") );
     menuMaintain->Enable( ID_MDBOPT, false );
@@ -460,8 +451,8 @@
     m_menuFile->AppendSeparator(); //----
 	wxMenu *menuOpendir = new wxMenu();
     m_menuFile->AppendSubMenu( menuOpendir,  wxT("フォルダを開く") );
-    menuOpendir->Append( ID_MOAD, wxT("アプリケーションフォルダ"), wxT("Open App Folder") );
-    menuOpendir->Append( ID_MODD, wxT("データフォルダ"),           wxT("Open Data Folder") );
+    menuOpendir->Append( ID_MOPAD, wxT("アプリケーションフォルダ"), wxT("Open App Folder") );
+    menuOpendir->Append( ID_MOPDD, wxT("データフォルダ"),           wxT("Open Data Folder") );
     m_menuFile->AppendSeparator(); //----
     m_menuFile->Append( wxID_EXIT, wxT("終了(&X)\tAlt-X"), wxT("Quit this program") );
 
@@ -488,102 +479,45 @@
 	
 	wxBoxSizer* bSizer;
 	bSizer = new wxBoxSizer( wxVERTICAL );
+	m_panel = new wxPanel( this );
 	
+	wxBoxSizer* bSizerPanel;
+	bSizerPanel = new wxBoxSizer( wxVERTICAL );
+
     // controls here
-	m_panelHead = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
+	m_panelHead = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 	wxBoxSizer* bSizerHead;
 	bSizerHead = new wxBoxSizer( wxHORIZONTAL );
 	
-    /* after version 2.11
-	m_staticTextHname = new wxStaticText( m_panelHead, wxID_ANY, wxT("氏名カナ検索"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerHead->Add( m_staticTextHname, 0, wxALL, 5 );
-	
-	m_searchCtrlHname = new wxSearchCtrl( m_panelHead, ID_SRCHHHS, wxT("３字以上入力"), wxDefaultPosition, wxSize(200,20), 0 );
-	#ifndef __WXMAC__
-	m_searchCtrlHname->ShowSearchButton( true );
-	#endif
-	bSizerHead->Add( m_searchCtrlHname, 0, wxALL, 1 );
-	
-	m_bitmapMkidx = new wxStaticBitmap( m_panelHead, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerHead->Add( m_bitmapMkidx, 0, wxALL, 1 );
-    */
-
 	bSizerHead->AddStretchSpacer( 1 );    // spacer
-
 	m_staticTextIdx = new wxStaticText( m_panelHead, wxID_ANY, wxT("インデックス"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerHead->Add( m_staticTextIdx, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_datePicker = new wxDatePickerCtrl( m_panelHead, ID_DTIDX, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY|wxDP_DROPDOWN );
-	bSizerHead->Add( m_datePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_btnLsCcn = new wxButton( m_panelHead, ID_LSCCN, wxT("一覧"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHead->Add( m_btnLsCcn, 0, wxALL, 5 );
+
+	m_btnPrevThu = new wxButton( m_panelHead, ID_PRVTHU, wxT("<< 前木"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHead->Add( m_btnPrevThu, 0, wxALL, 5 );
 	
-	m_buttonMkidx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxSize(50,25), 0 );
-	bSizerHead->Add( m_buttonMkidx, 0, wxALL, 5 );
+	m_datePicker = new wxDatePickerCtrl( m_panelHead, ID_DTPICKER, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY );
+	bSizerHead->Add( m_datePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_btnNextThu = new wxButton( m_panelHead, ID_NXTTHU, wxT("次木 >>"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHead->Add( m_btnNextThu, 0, wxALL, 5 );
 	
+	m_btnMkIdx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHead->Add( m_btnMkIdx, 0, wxALL, 5 );
+
 	m_panelHead->SetSizer( bSizerHead );
 	m_panelHead->Layout();
 	bSizerHead->Fit( m_panelHead );
 	
-    // メインペイン
-	wxBoxSizer* bSizerHtml;
-	bSizerHtml = new wxBoxSizer( wxVERTICAL );
-	m_splitter = new wxSplitterWindow( this, ID_SPLT, wxDefaultPosition, wxDefaultSize, 0 );
-
     // 検索結果Html
-	m_html = new wxHtmlWindow( m_splitter, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+	m_html = new wxHtmlWindow( m_panel, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
     m_html->LoadPage( wxT("html/start.html") );
 	
-    /* after version 2.11
-	// 被保険者カナ検索Grid
-	m_gridHhs = new wxGrid( m_panelHtml, ID_HLST, wxDefaultPosition, wxDefaultSize, 0 );
-	m_gridHhs->CreateGrid( 0, 5 );
-	m_gridHhs->EnableEditing( true );
-	m_gridHhs->EnableGridLines( true );
-	m_gridHhs->EnableDragGridSize( false );
-	m_gridHhs->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridHhs->AutoSizeColumns();
-	m_gridHhs->EnableDragColMove( false );
-	m_gridHhs->SetColLabelValue( 0, wxT("番号") );
-	m_gridHhs->SetColLabelValue( 1, wxT("氏名") );
-	m_gridHhs->SetColLabelValue( 2, wxT("カナ") );
-	m_gridHhs->SetColLabelValue( 3, wxT("生年月日") );
-	m_gridHhs->SetColLabelValue( 4, wxT("住所") );
-	m_gridHhs->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Cell Defaults
-	m_gridHhs->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_BOTTOM );
-	m_gridHhs->Hide();
-	
-	bSizerHtml->Add( m_gridHhs, 0, wxALL, 5 );
-    */
-
-	// 審査会合議体表示Grid
-	m_gridCcn = new wxGrid( m_splitter, ID_CCN, wxDefaultPosition, wxDefaultSize, 0 );
-	m_gridCcn->CreateGrid( 0, 2 );
-	m_gridCcn->EnableEditing( true );
-	m_gridCcn->EnableGridLines( true );
-	m_gridCcn->EnableDragGridSize( false );
-	m_gridCcn->SetMargins( 0, 0 );
-	m_gridCcn->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_BOTTOM );
-    m_gridCcn->Show(false);
-	
-	// Columns
-	m_gridCcn->AutoSizeColumns();
-	m_gridCcn->EnableDragColMove( false );
-	m_gridCcn->SetColLabelValue( 0, wxT("審査会年月日") );
-	m_gridCcn->SetColLabelValue( 1, wxT("DB更新時刻") );
-    m_gridCcn->SetColSize( 0, 100 );
-    m_gridCcn->SetColSize( 1, 200 );
-	m_gridCcn->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-    m_splitter->Initialize( m_html );
-	m_splitter->SetSizer( bSizerHtml );
-	m_splitter->Layout();
-	bSizerHtml->Fit( m_splitter );
-	
     // コマンドライン	
-	m_panelCmd = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
+	m_panelCmd = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 	wxBoxSizer* bSizerCmd;
 	bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
 	
@@ -598,13 +532,18 @@
 	m_panelCmd->Layout();
 	bSizerCmd->Fit( m_panelCmd );
 
+	bSizerPanel->Add( m_panelHead, 0, wxEXPAND|wxTOP, 1 );
+	bSizerPanel->Add( m_html,      1, wxEXPAND|wxALL, 1 );
+	bSizerPanel->Add( m_panelCmd,  0, wxEXPAND|wxALL, 0 );
+	
+	m_panel->SetSizer( bSizerPanel );
+	m_panel->Layout();
+    bSizerPanel->Fit( m_panel );
 
-	bSizer->Add( m_panelHead, 0, wxEXPAND|wxTOP, 1 );
-	bSizer->Add( m_splitter,  1, wxEXPAND|wxALL, 1 );
-	bSizer->Add( m_panelCmd,  0, wxEXPAND|wxALL, 0 );
-	
+	bSizer->Add( m_panel, 1, wxEXPAND|wxALL, 0 );
 	this->SetSizer( bSizer );
 	this->Layout();
+  	this->SetMinSize( wxSize( 550, 600 ) );
 }
 
 // destructor
@@ -614,24 +553,43 @@
 
 // Event Table
 BEGIN_EVENT_TABLE( MyFrame, wxFrame )
+    EVT_SIZE( MyFrame::OnSize )
+    EVT_MOVE( MyFrame::OnMove )
     EVT_MENU( wxID_EXIT,  MyFrame::OnQuit )
     EVT_MENU( wxID_ABOUT, MyFrame::OnAbout )
     EVT_MENU( ID_MUPHHS,  MyFrame::OnUpdateHhsDb )
-    EVT_MENU( ID_MLSCCN,  MyFrame::OnListCcn )
     EVT_MENU( ID_MDBBKUP, MyFrame::OnBackupDB )
     EVT_MENU( ID_MDBOPT,  MyFrame::OnOptimizeDB )
     EVT_MENU( ID_MCHKHHS, MyFrame::OnCheckHhs )
-    EVT_MENU( ID_MOAD,    MyFrame::OnOpenAppDir )
-    EVT_MENU( ID_MODD,    MyFrame::OnOpenDataDir )
+    EVT_MENU( ID_MOPAD,   MyFrame::OnOpenAppDir )
+    EVT_MENU( ID_MOPDD,   MyFrame::OnOpenDataDir )
     EVT_MENU( ID_MHELP,   MyFrame::OnHelp )
-
-	//EVT_TEXT_ENTER( ID_SRCHHHS, MyFrame::OnHhsSearch ) after version 2.11
-    EVT_BUTTON( ID_MKIDX, MyFrame::OnMkIndex )
-
+    EVT_BUTTON( ID_PRVTHU, MyFrame::OnPrevThu )
+    EVT_BUTTON( ID_NXTTHU, MyFrame::OnNextThu )
+    EVT_BUTTON( ID_MKIDX,  MyFrame::OnMkIndex )
+    EVT_BUTTON( ID_LSCCN,  MyFrame::OnListCcn )
     EVT_CLOSE( MyFrame::SaveConfig )
 END_EVENT_TABLE()
 
 // Event Handlers
+/* サイズ変更 */
+void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    wxRect r = this->GetRect();
+    int w = r.GetWidth();
+    int h = r.GetHeight();
+    SetStatusText( wxString::Format(wxT("%dx%d"),w,h), 2 );
+    return;
+}
+/* ウィンドウ移動 */
+void MyFrame::OnMove(wxMoveEvent& WXUNUSED(event))
+{
+    wxRect r = this->GetRect();
+    int x = r.GetX();
+    int y = r.GetY();
+    SetStatusText( wxString::Format(wxT("(%d,%d)"),x,y), 2 );
+    return;
+}
 /* 終了 */
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
@@ -669,91 +627,92 @@
         wxT("About this program"), wxOK | wxICON_INFORMATION, this );
 }
 
-/* 被保険者検索 */
-/* after version 2.11
-void MyFrame::OnHhsSearch(wxCommandEvent& WXUNUSED(event))
+// 前木
+void MyFrame::OnPrevThu(wxCommandEvent& WXUNUSED(event))
 {
-    this->m_html->Hide();
-	this->m_gridCcn->Hide();
-    this->m_gridHhs->Show(true);
-
-    wxString gszFile = wxGetCwd() + wxT("/db/hhs.db");
-    wxSQLite3Database hhsdb;
-    hhsdb.Open( gszFile );
-
-    wxSQLite3Statement stmt = hhsdb.PrepareStatement("SELECT count(*) FROM hhs_master WHERE kana LIKE ?");
-    stmt.Bind( 1, this->m_searchCtrlHname->GetValue() );
-    wxSQLite3ResultSet q = stmt.ExecuteQuery();
-    wxString cnt = q.GetString(0);
-
-    if ( cnt.Cmp(wxT("0")) == '0' ) {
-        wxString msg = cnt + wxT("指定した条件の被保険者はいませんでした．");
-    }
-    else {
-        wxString msg = cnt + wxT("件マッチしました．");
-        return ; // test now
-
-        stmt = hhsdb.PrepareStatement("SELECT hhs, name, kana, addr, birth, sex FROM hhs_master ORDER BY birth DESC");
-        q = stmt.ExecuteQuery();
-        wxSQLite3ResultSet q = stmt.ExecuteQuery();
-        while ( q.NextRow() ) {
-            wxString hhs   = q.GetString(0);
-            wxString name  = q.GetString(1);
-            wxString kana  = q.GetString(2);
-            wxString addr  = q.GetString(3);
-            wxString birth = q.GetString(4);
-            wxString sex   = q.GetString(5);
-            // ここに gridに 追加するコード
-        }
-    }
-
-    stmt.Finalize();
-    hhsdb.Close();
+	wxDateTime dt = m_datePicker->GetValue();
+    wxDateSpan ds( 0, 0, 0, 1 );
+    dt -= ds;
+    dt.SetToPrevWeekDay( wxDateTime::Thu );
+    m_datePicker->SetValue( dt );
 }
-*/
+// 次木
+void MyFrame::OnNextThu(wxCommandEvent& WXUNUSED(event))
+{
+	wxDateTime dt = m_datePicker->GetValue();
+    wxDateSpan ds( 0, 0, 0, 1 );
+    dt += ds;
+    dt.SetToNextWeekDay( wxDateTime::Thu );
+    m_datePicker->SetValue( dt );
+}
 
 /* インデックス作成 */
 void MyFrame::OnMkIndex(wxCommandEvent& WXUNUSED(event))
 {
-    FrameHhsDB *f = (FrameHhsDB*)FindWindowById( ID_HHSDB );
+	wxDateTime dt = m_datePicker->GetValue();
+    wxString month = dt.Format(wxT("%m"));
+    wxString year  = dt.Format(wxT("%Y"));
+    if ( month.IsSameAs(wxT("01")) || month.IsSameAs(wxT("02")) || month.IsSameAs(wxT("03")) ) {
+        long y;
+        year.ToLong( &y, 10 );
+        y--;
+        year = wxString::Format(wxT("%d"),y);
+    }
+    wxString pathroot = wxGetApp().rootdir + wxFILE_SEP_PATH + year + dt.Format(wxT("\\%Y%m%d"));
+    wxDir rootd(pathroot);
+    if ( !wxDir::Exists(pathroot) ) {
+        wxMessageBox( wxT("フォルダが存在しません．")+pathroot );
+        return;
+    }
+
+    wxProgressDialog pd( wxT("進行状況"), wxT("処理開始..."), 200, this, wxPD_APP_MODAL|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE );
+    pd.SetSize( wxSize(320,140) );
+    int count=0;
+
+    wxString ccndir;
+    bool cont = rootd.GetFirst( &ccndir, wxT("*.*"), wxDIR_DIRS );
+    while ( cont ) {
+        wxString gszFile = wxGetCwd() + wxT("/db/ccn.db");
+        wxSQLite3Database ccndb;
+        ccndb.Open( gszFile );
 
-    if ( f == NULL ) {
-        FrameHhsDB *hhsdb = new FrameHhsDB( this, ID_HHSDB ); 
-        hhsdb->Show(true);
+        wxSQLite3Statement stmt = ccndb.PrepareStatement("INSERT OR REPLACE INTO ccn VALUES( ?, datetime('now','localtime') )");
+        stmt.Bind( 1, dt.Format(wxT("%Y-%m-%d")) );
+        stmt.ExecuteQuery();
+
+        stmt.Finalize();
+
+        wxDir ccnd( pathroot + wxFILE_SEP_PATH + ccndir );
+        if ( !ccnd.IsOpened() ) return;
+        wxString hhsdir;
+        bool c = ccnd.GetFirst( &hhsdir, wxT("*.*"), wxDIR_DIRS );
+	    wxRegEx reHhs(wxT("^0[1238][0-9]{8}$"));	// 被保番チェック
+        while ( c ) {
+            if ( reHhs.Matches(hhsdir) ) {
+                wxString path = pathroot + wxFILE_SEP_PATH + ccndir + wxFILE_SEP_PATH + hhsdir;
+
+                stmt = ccndb.PrepareStatement("INSERT OR REPLACE INTO path VALUES( ?, ? )");
+                stmt.Bind( 1, hhsdir );
+                stmt.Bind( 2, path );
+                stmt.ExecuteQuery();
+
+                stmt.Finalize();
+            }
+            c = ccnd.GetNext(&hhsdir);
+            pd.Update( count++, hhsdir+wxT("＠")+ccndir+wxT("を処理しました．") );
+        }
+        ccndb.Close();
+
+        cont = rootd.GetNext(&ccndir);
     }
-    else {
-        f->Raise();
-    }
-    return;
+    wxMessageBox(wxT("インデックス作成が終了しました．"));
 }
 
-/* インデックス更新一覧 */
+/* インデックス一覧 */
 void MyFrame::OnListCcn(wxCommandEvent& WXUNUSED(event))
 {
-	this->m_splitter->ReplaceWindow( this->m_html, this->m_gridCcn );
-    this->m_gridCcn->Show(true);
-    this->m_html->Show(false);
-	MyCmdBox *c = (MyCmdBox*)FindWindowById( ID_CMD );
-    c->Clear();
-
-    wxString gszFile = wxGetCwd() + wxT("/db/ccn.db");
-    wxSQLite3Database ccndb;
-    ccndb.Open( gszFile );
-
-    wxSQLite3Statement stmt = ccndb.PrepareStatement("SELECT ymd, time FROM ccn ORDER BY ymd DESC, time DESC");
-    wxSQLite3ResultSet q = stmt.ExecuteQuery();
-    int r=0;
-    while ( q.NextRow() ) {
-        wxString ymd  = q.GetString(0);
-        wxString time = q.GetString(1);
-        this->m_gridCcn->AppendRows(1);
-        this->m_gridCcn->SetCellValue(r,0,ymd);
-        this->m_gridCcn->SetCellValue(r,1,time);
-        r++;
-    }
-
-    stmt.Finalize();
-    ccndb.Close();
+    FrameCcn *fc = new FrameCcn( NULL, ID_CCN, wxT("Index Viewer"), wxDefaultPosition, wxDefaultSize, wxCAPTION|wxFRAME_NO_TASKBAR|wxTAB_TRAVERSAL );
+    fc->Show(true);
 }
 
 /* 被保険者DB更新 */