Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1aH3po-0000eA-Sq for pgadmin-hackers@arkaria.postgresql.org; Thu, 07 Jan 2016 06:14:09 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1aH3po-0003Y6-AJ for pgadmin-hackers@arkaria.postgresql.org; Thu, 07 Jan 2016 06:14:08 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1aH3pa-0003J3-I9 for pgadmin-hackers@postgresql.org; Thu, 07 Jan 2016 06:13:54 +0000 Received: from palladium.wars-nicht.de ([89.238.64.91] helo=polonium.wars-nicht.de) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1aH3pW-0002pR-7q for pgadmin-hackers@postgresql.org; Thu, 07 Jan 2016 06:13:54 +0000 Received: from localhost (localhost [127.0.0.1]) by polonium.wars-nicht.de (Postfix) with ESMTP id 94F0E114037 for ; Thu, 7 Jan 2016 07:13:49 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at polonium X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from polonium.wars-nicht.de ([127.0.0.1]) by localhost (polonium.wars-nicht.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DaYA1Q09HmcW for ; Thu, 7 Jan 2016 07:13:48 +0100 (CET) Received: from diamond.wars-nicht.de (unknown [216.3.10.6]) by polonium.wars-nicht.de (Postfix) with ESMTPSA id D7613114035 for ; Thu, 7 Jan 2016 07:13:47 +0100 (CET) Received: from [127.0.0.1] (localhost [127.0.0.1]) by diamond.wars-nicht.de (Postfix) with ESMTP id 2E6121BE0235 for ; Thu, 7 Jan 2016 07:13:46 +0100 (CET) To: pgadmin-hackers@postgresql.org From: Andreas 'ads' Scherbaum Subject: Updated Greenplum documentation Message-ID: <568E021A.4050407@wars-nicht.de> Date: Thu, 7 Jan 2016 07:13:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080102070303070809090802" X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org This is a multi-part message in MIME format. --------------080102070303070809090802 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hello, attached patch updates the URL of the Greenplum documentation, and adds a few more pathnames for recent versions. The URL now redirects to the latest version. Regards, -- Andreas 'ads' Scherbaum German PostgreSQL User Group European PostgreSQL User Group - Board of Directors Volunteer Regional Contact, Germany - PostgreSQL Project --------------080102070303070809090802 Content-Type: text/x-patch; name="gp-doc.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gp-doc.diff" diff --git a/pgadmin/pgAdmin3.cpp b/pgadmin/pgAdmin3.cpp index 3f9cf3f..87ee9f0 100644 --- a/pgadmin/pgAdmin3.cpp +++ b/pgadmin/pgAdmin3.cpp @@ -1167,6 +1167,8 @@ void pgAdmin3::InitXtraPaths() // Ugly... Greenplum client releases have no predictable numbers, because the path is the server version if (!programFiles.IsEmpty()) { + path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin")); + path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\bin")); @@ -1174,6 +1176,8 @@ void pgAdmin3::InitXtraPaths() path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.3\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.2\\bin")); + path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib")); + path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\lib")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\lib")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\lib")); @@ -1184,6 +1188,8 @@ void pgAdmin3::InitXtraPaths() if (!programFilesX86.IsEmpty()) { + path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin")); + path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.4\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\bin")); @@ -1191,6 +1197,8 @@ void pgAdmin3::InitXtraPaths() path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.3\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.2\\bin")); + path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\lib")); + path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.4\\lib")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\lib")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\lib")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\lib")); @@ -1206,6 +1214,10 @@ void pgAdmin3::InitXtraPaths() // Generic Unix paths + path.Add(wxT("/usr/local/greenplum-clients-5.0/bin")); + path.Add(wxT("/opt/local/greenplum-clients-5.0/bin")); + path.Add(wxT("/usr/local/greenplum-clients-4.4/bin")); + path.Add(wxT("/opt/local/greenplum-clients-4.4/bin")); path.Add(wxT("/usr/local/greenplum-clients-4.3/bin")); path.Add(wxT("/opt/local/greenplum-clients-4.3/bin")); path.Add(wxT("/usr/local/greenplum-clients-4.2/bin")); @@ -1219,6 +1231,10 @@ void pgAdmin3::InitXtraPaths() path.Add(wxT("/usr/local/greenplum-clients-3.2/bin")); path.Add(wxT("/opt/local/greenplum-clients-3.2/bin")); + path.Add(wxT("/usr/local/greenplum-clients-5.0/lib")); + path.Add(wxT("/opt/local/greenplum-clients-5.0/lib")); + path.Add(wxT("/usr/local/greenplum-clients-4.4/lib")); + path.Add(wxT("/opt/local/greenplum-clients-4.4/lib")); path.Add(wxT("/usr/local/greenplum-clients-4.3/lib")); path.Add(wxT("/opt/local/greenplum-clients-4.3/lib")); path.Add(wxT("/usr/local/greenplum-clients-4.2/lib")); @@ -1664,7 +1680,7 @@ void pgAdmin3::InitHelp() if (edbHelpPath.IsEmpty()) edbHelpPath = wxT("http://www.enterprisedb.com/docs/en/current/server/"); if (gpHelpPath.IsEmpty()) - gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/index.html"); + gpHelpPath = wxT("http://gpdb.docs.pivotal.io/s"); if (slonyHelpPath.IsEmpty()) slonyHelpPath = wxT("http://www.slony.info/documentation/"); diff --git a/pgadmin/utils/misc.cpp b/pgadmin/utils/misc.cpp index 93b56f8..96464c0 100644 --- a/pgadmin/utils/misc.cpp +++ b/pgadmin/utils/misc.cpp @@ -676,7 +676,7 @@ wxString CleanHelpPath(const wxString &path) thePath.Lower().EndsWith(wxT(".zip"))) return thePath; - // In all othe cases we must have a directory + // In all other cases we must have a directory wxString sep; // Figure out the appropriate seperator @@ -764,9 +764,21 @@ void DisplayHelp(const wxString &helpTopic, const HelpType helpType) // the old help path (stored in the settings) is no longer working static wxString gpHelpPath = settings->GetGpHelpPath(); + // Note: never end the URL on "index.html" + // InitHelp() does obscure magic with this ending + if (gpHelpPath.CmpNoCase(wxT("http://docs.gopivotal.com/gpdb/")) == 0) + { + gpHelpPath = wxT("http://gpdb.docs.pivotal.io/"); + // Replace the path to the old domain with the link to + // the new documentation path + // The old link is working for now, but there is no guarantee + // that it will stay this way + // Also the new link automatically redirects to the latest version + settings->SetGpHelpPath(gpHelpPath); + } if (gpHelpPath.CmpNoCase(wxT("http://www.greenplum.com/docs/3300/")) == 0) { - gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/"); + gpHelpPath = wxT("http://gpdb.docs.pivotal.io/"); // this is the old link, update the link to the new documentation link // problem: this saves the link into the configuration file settings->SetGpHelpPath(gpHelpPath); --------------080102070303070809090802 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --------------080102070303070809090802--