This is an automated email from the ASF dual-hosted git repository.
srowen pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/spark-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 444492a Fix source download link
444492a is described below
commit 444492a312dc70845c3525c9a8921ecd6f3567d6
Author: Sean Owen <sean.o...@databricks.com>
AuthorDate: Tue Jun 18 10:56:10 2019 -0500
Fix source download link
The download javascript wasn't correctly generating the source file name.
Also, minor, it wasn't correctly respecting whether it should be obtained from
the mirror network or archive server.
Author: Sean Owen <sean.o...@databricks.com>
Closes #207 from srowen/DownloadJS.
---
js/downloads.js | 12 ++++++------
site/js/downloads.js | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/js/downloads.js b/js/downloads.js
index bf56d75..f8de69e 100644
--- a/js/downloads.js
+++ b/js/downloads.js
@@ -12,10 +12,10 @@ function addRelease(version, releaseDate, packages,
mirrored) {
}
var sources = {pretty: "Source Code", tag: "sources"};
-var hadoopFree = {pretty: "Pre-build with user-provided Apache Hadoop", tag:
"without-hadoop"};
+var hadoopFree = {pretty: "Pre-built with user-provided Apache Hadoop", tag:
"without-hadoop"};
var hadoop2p6 = {pretty: "Pre-built for Apache Hadoop 2.6", tag: "hadoop2.6"};
var hadoop2p7 = {pretty: "Pre-built for Apache Hadoop 2.7 and later", tag:
"hadoop2.7"};
-var scala2p12_hadoopFree = {pretty: "Pre-build with Scala 2.12 and
user-provided Apache Hadoop", tag: "without-hadoop-scala-2.12"};
+var scala2p12_hadoopFree = {pretty: "Pre-built with Scala 2.12 and
user-provided Apache Hadoop", tag: "without-hadoop-scala-2.12"};
// 2.2.0+
var packagesV8 = [hadoop2p7, hadoop2p6, hadoopFree, sources];
@@ -86,10 +86,10 @@ function onVersionSelect() {
}
// Populate releases
- updateDownloadLink(releases[version].mirrored);
+ updateDownloadLink();
}
-function updateDownloadLink(isMirrored) {
+function updateDownloadLink() {
var versionSelect = document.getElementById("sparkVersionSelect");
var packageSelect = document.getElementById("sparkPackageSelect");
var downloadLink = document.getElementById("spanDownloadLink");
@@ -102,10 +102,10 @@ function updateDownloadLink(isMirrored) {
var pkg = getSelectedValue(packageSelect);
var artifactName = "spark-" + version + "-bin-" + pkg + ".tgz"
- .replace(/-bin-sources/, ""); // special case for source packages
+ artifactName = artifactName.replace(/-bin-sources/, ""); // special case for
source packages
var downloadHref = "";
- if (isMirrored) {
+ if (releases[version].mirrored) {
downloadHref = "https://www.apache.org/dyn/closer.lua/spark/spark-"; +
version + "/" + artifactName;
} else {
downloadHref = "https://archive.apache.org/dist/spark/spark-"; + version +
"/" + artifactName;
diff --git a/site/js/downloads.js b/site/js/downloads.js
index bf56d75..f8de69e 100644
--- a/site/js/downloads.js
+++ b/site/js/downloads.js
@@ -12,10 +12,10 @@ function addRelease(version, releaseDate, packages,
mirrored) {
}
var sources = {pretty: "Source Code", tag: "sources"};
-var hadoopFree = {pretty: "Pre-build with user-provided Apache Hadoop", tag:
"without-hadoop"};
+var hadoopFree = {pretty: "Pre-built with user-provided Apache Hadoop", tag:
"without-hadoop"};
var hadoop2p6 = {pretty: "Pre-built for Apache Hadoop 2.6", tag: "hadoop2.6"};
var hadoop2p7 = {pretty: "Pre-built for Apache Hadoop 2.7 and later", tag:
"hadoop2.7"};
-var scala2p12_hadoopFree = {pretty: "Pre-build with Scala 2.12 and
user-provided Apache Hadoop", tag: "without-hadoop-scala-2.12"};
+var scala2p12_hadoopFree = {pretty: "Pre-built with Scala 2.12 and
user-provided Apache Hadoop", tag: "without-hadoop-scala-2.12"};
// 2.2.0+
var packagesV8 = [hadoop2p7, hadoop2p6, hadoopFree, sources];
@@ -86,10 +86,10 @@ function onVersionSelect() {
}
// Populate releases
- updateDownloadLink(releases[version].mirrored);
+ updateDownloadLink();
}
-function updateDownloadLink(isMirrored) {
+function updateDownloadLink() {
var versionSelect = document.getElementById("sparkVersionSelect");
var packageSelect = document.getElementById("sparkPackageSelect");
var downloadLink = document.getElementById("spanDownloadLink");
@@ -102,10 +102,10 @@ function updateDownloadLink(isMirrored) {
var pkg = getSelectedValue(packageSelect);
var artifactName = "spark-" + version + "-bin-" + pkg + ".tgz"
- .replace(/-bin-sources/, ""); // special case for source packages
+ artifactName = artifactName.replace(/-bin-sources/, ""); // special case for
source packages
var downloadHref = "";
- if (isMirrored) {
+ if (releases[version].mirrored) {
downloadHref = "https://www.apache.org/dyn/closer.lua/spark/spark-"; +
version + "/" + artifactName;
} else {
downloadHref = "https://archive.apache.org/dist/spark/spark-"; + version +
"/" + artifactName;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
