CVS Commit by andreas: typo fix
require($_SERVER['DOCUMENT_ROOT']."/includes/top_config.php");
?>
CVS Commit by andreas: typo fix
Log Message:
-----------
typo fix
Modified Files:
--------------
pgadmin3/src/db:
pgConn.cpp (r1.51 -> r1.52)
pgadmin3/src/ui:
frmStatus.cpp (r1.36 -> r1.37)
Index: pgConn.cpp
===================================================================
RCS file: /projects/pgadmin3/src/db/pgConn.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lsrc/db/pgConn.cpp -Lsrc/db/pgConn.cpp -u -w -r1.51 -r1.52
--- src/db/pgConn.cpp
+++ src/db/pgConn.cpp
@@ -63,6 +63,7 @@
majorVersion=0;
noticeArg=0;
connStatus = PGCONN_BAD;
+ features[FEATURE_INITIALIZED] = false;
#ifdef __WXMSW__
struct in_addr ipaddr;
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.36 -r1.37
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -656,6 +656,9 @@
void frmStatus::emptyLogfileCombo()
{
+ if (cbLogfiles->GetCount()) // first entry has no client data
+ cbLogfiles->Delete(0);
+
while (cbLogfiles->GetCount())
{
wxDateTime *dt=(wxDateTime*)cbLogfiles->GetClientData(0);
@@ -675,8 +678,8 @@
count--;
pgSet *set=connection->ExecuteSet(
- wxT("SELECT ts, pid, fn FROM pg_logfiles_ls() AS (ts timestamp, pid int4, fn text)\n")
- wxT(" ORDER BY ts ASC"));
+ wxT("SELECT filename, pid, filetime FROM pg_logdir_ls\n")
+ wxT(" ORDER BY filetime ASC"));
if (set)
{
if (set->NumRows() <= count)
@@ -688,9 +691,9 @@
while (!set->Eof())
{
count++;
- wxString fn= set->GetVal(wxT("fn"));
+ wxString fn= set->GetVal(wxT("filename"));
long pid = set->GetLong(wxT("pid"));
- wxDateTime ts=set->GetDateTime(wxT("ts"));
+ wxDateTime ts=set->GetDateTime(wxT("filetime"));
cbLogfiles->Append(DateToStr(ts) + wxT(" (") + NumToStr(pid) + wxT(")"), new wxDateTime(ts));
Home |
Main Index |
Thread Index