SVN Commit by andreas: r4509 - trunk/pgadmin3/src/slony

Author: andreas
Date: 2005-10-05 23:36:42 +0100 (Wed, 05 Oct 2005)
New Revision: 4509

Modified:
trunk/pgadmin3/src/slony/dlgRepPath.cpp
trunk/pgadmin3/src/slony/dlgRepSubscription.cpp
Log:
Offer enabled nodes only

Modified: trunk/pgadmin3/src/slony/dlgRepPath.cpp
===================================================================
--- trunk/pgadmin3/src/slony/dlgRepPath.cpp 2005-10-05 22:34:45 UTC (rev 4508)
+++ trunk/pgadmin3/src/slony/dlgRepPath.cpp 2005-10-05 22:36:42 UTC (rev 4509)
@@ -77,7 +77,7 @@
wxT(" FROM ") + cluster->GetSchemaPrefix() + wxT("sl_node\n")
wxT(" LEFT JOIN ") + cluster->GetSchemaPrefix() + wxT("sl_path ON pa_client=\n") + NumToStr(node->GetSlId()) +
wxT(" AND pa_server=no_id\n")
- wxT(" WHERE pa_client IS NULL\n")
+ wxT(" WHERE no_active AND pa_client IS NULL\n")
wxT(" ORDER BY no_id")
);

Modified: trunk/pgadmin3/src/slony/dlgRepSubscription.cpp
===================================================================
--- trunk/pgadmin3/src/slony/dlgRepSubscription.cpp 2005-10-05 22:34:45 UTC (rev 4508)
+++ trunk/pgadmin3/src/slony/dlgRepSubscription.cpp 2005-10-05 22:36:42 UTC (rev 4509)
@@ -94,7 +94,7 @@
pgSet *sets = connection->ExecuteSet(
wxT("SELECT no_id, no_comment\n")
wxT(" FROM ") + cluster->GetSchemaPrefix() + wxT("sl_node\n")
- wxT(" WHERE no_id <> ") + NumToStr(cluster->GetLocalNodeID()));
+ wxT(" WHERE no_active AND no_id <> ") + NumToStr(cluster->GetLocalNodeID()));

if (sets)
{