Index: frm/frmMain.cpp =================================================================== --- frm/frmMain.cpp (revision 4874) +++ frm/frmMain.cpp (working copy) @@ -630,7 +630,7 @@ } -int frmMain::ReconnectServer(pgServer *server) +int frmMain::ReconnectServer(pgServer *server, bool restore) { // Create a server object and connect it. wxBusyInfo waiting(wxString::Format(_("Connecting to server %s (%s:%d)"), @@ -644,26 +644,29 @@ { case PGCONN_OK: { - StartMsg(_("Restoring previous environment")); - wxLogInfo(wxT("pgServer object initialised as required.")); + if (restore) + { + StartMsg(_("Restoring previous environment")); + wxLogInfo(wxT("pgServer object initialised as required.")); - server->ShowTreeDetail(browser); - browser->Freeze(); - item=RestoreEnvironment(server); - browser->Thaw(); + server->ShowTreeDetail(browser); + browser->Freeze(); + item=RestoreEnvironment(server); + browser->Thaw(); - if (item) - { - browser->SelectItem(item); + if (item) + { + browser->SelectItem(item); - wxSafeYield(); - browser->Expand(item); - browser->EnsureVisible(item); - } - if (item) - EndMsg(true); - else - EndMsg(false); + wxSafeYield(); + browser->Expand(item); + browser->EnsureVisible(item); + } + if (item) + EndMsg(true); + else + EndMsg(false); + } return res; } case PGCONN_DNSERR: @@ -797,6 +800,24 @@ browser->SetItemText(serversObj->GetId(), label); } +pgServer *frmMain::ConnectToServer(const wxString& servername) +{ + for (int i = 0; ; i++) + { + pgObject *o = serversObj->FindChild(browser, i); + if (!o) + return NULL; + if (o->IsCreatedBy(serverFactory)) + { + pgServer *s = (pgServer *)o; + if (s->GetDescription() == servername) + { + ReconnectServer(s,false); + return s; + } + } + } +} void frmMain::StartMsg(const wxString& msg) { Index: include/frmMain.h =================================================================== --- include/frmMain.h (revision 4874) +++ include/frmMain.h (working copy) @@ -59,9 +59,10 @@ ctlListView *GetDependsOn(); ctlListView *GetReferencedBy(); void StoreServers(); - int ReconnectServer(pgServer *server); + int ReconnectServer(pgServer *server, bool restore = true); void ReportConnError(pgServer *server); pgServerCollection *GetServerCollection() { return serversObj; } + pgServer *ConnectToServer(const wxString& servername); private: ctlTree *browser; Index: pgAdmin3.cpp =================================================================== --- pgAdmin3.cpp (revision 4874) +++ pgAdmin3.cpp (working copy) @@ -15,6 +15,7 @@ // wxWindows headers #include #include +#include #include #include #include @@ -170,35 +171,46 @@ // The Application! bool pgAdmin3::OnInit() { + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + {wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, + {wxCMD_LINE_OPTION, wxT("s"), wxT("server"), wxT("auto-connect to specified server"), wxCMD_LINE_VAL_STRING}, + {wxCMD_LINE_SWITCH, wxT("q"), wxT("query"), wxT("open query tool to auto-connected server"), wxCMD_LINE_VAL_NONE}, + {wxCMD_LINE_OPTION, wxT("cm"), NULL, wxT("edit main configuration file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE}, + {wxCMD_LINE_OPTION, wxT("ch"), NULL, wxT("edit HBA configuration file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE}, + {wxCMD_LINE_OPTION, wxT("c"), NULL, wxT("edit any configuration file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE}, + {wxCMD_LINE_SWITCH, wxT("t"), NULL, wxT("dialog translation test mode"), wxCMD_LINE_VAL_NONE}, + {wxCMD_LINE_NONE} + }; + + // we are here InitPaths(); frmConfig::tryMode configMode=frmConfig::NONE; + wxString configFile; - if (argc > 1 && *argv[1] == '-') - { - switch (argv[1][1]) - { - case 'c': - { - // file configurator mode - if (argv[1][2]== 'm') - configMode = frmConfig::MAINFILE; - else if (argv[1][2]== 'h') - configMode = frmConfig::HBAFILE; - else - configMode=frmConfig::ANYFILE; + wxCmdLineParser cmdParser(cmdLineDesc, argc, argv); + if (cmdParser.Parse() != 0) + return false; - break; - } - case 't': - { - dialogTestMode = true; - break; - } - } - } + if (cmdParser.Found(wxT("q")) && !cmdParser.Found(wxT("s"))) + { + cmdParser.Usage(); + return false; + } + + if (cmdParser.Found(wxT("cm"), &configFile)) + configMode = frmConfig::MAINFILE; + else if (cmdParser.Found(wxT("ch"), &configFile)) + configMode = frmConfig::HBAFILE; + else if (cmdParser.Found(wxT("c"), &configFile)) + configMode = frmConfig::ANYFILE; + if (cmdParser.Found(wxT("t"))) + dialogTestMode = true; + + // evaluate all working paths #if defined(__WXMSW__) @@ -351,29 +363,15 @@ if (configMode) { - int i; - - for (i=2 ; i < argc ; i++) - { - wxString str; - if (*argv[i] == '"') - { - wxString str=argv[i]+1; - str=str.Mid(0, str.Length()-1); - } - else - str = argv[i]; - - if (configMode == frmConfig::ANYFILE && wxDir::Exists(str)) - { - frmConfig::Create(APPNAME_L, str + wxT("/pg_hba.conf"), frmConfig::HBAFILE); - frmConfig::Create(APPNAME_L, str + wxT("/postgresql.conf"), frmConfig::MAINFILE); - } - else - { - frmConfig::Create(APPNAME_L, str, configMode); - } - } + if (configMode == frmConfig::ANYFILE && wxDir::Exists(configFile)) + { + frmConfig::Create(APPNAME_L, configFile + wxT("/pg_hba.conf"), frmConfig::HBAFILE); + frmConfig::Create(APPNAME_L, configFile + wxT("/postgresql.conf"), frmConfig::MAINFILE); + } + else + { + frmConfig::Create(APPNAME_L, configFile, configMode); + } if (winSplash) { winSplash->Close(); @@ -413,6 +411,17 @@ delete winSplash; } + wxString str; + if (cmdParser.Found(wxT("s"), &str)) + { + pgServer *srv = winMain->ConnectToServer(str); + if (srv && cmdParser.Found(wxT("q"))) + { + frmQuery *fq = new frmQuery(winMain, wxEmptyString, srv->CreateConn(), wxString(wxT(""))); + fq->Go(); + } + } + // Display a Tip if required. extern sysSettings *settings; wxCommandEvent evt = wxCommandEvent();