Author: buildbot
Date: Thu May 1 15:47:19 2014
New Revision: 907661
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/download/test/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 1 15:47:19 2014
@@ -1 +1 @@
-1591683
+1591686
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 1 15:47:19 2014
@@ -1 +1 @@
-1591683
+1591686
Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Thu May
1 15:47:19 2014
@@ -39,6 +39,7 @@ function alertDbg( function_name ) {
alert ( ""
+ function_name
+ "\n"
+ "LANG_ISO: " + "\t\t\t\t\t" +
LANG_ISO + "\n"
+ + "LANG_ARRAY: " + "\t\t\t\t\t" +
LANG_ARRAY + "\n"
+ "RELEASE_MATRIX_PLATFORM_POS: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS + "\n"
+ "RELEASE_MATRIX_PLATFORM: " + "\t\t\t" +
RELEASE_MATRIX_PLATFORM + "\n"
+ "UI_PLATFORM: " + "\t\t\t\t\t" +
UI_PLATFORM + "\n"
@@ -49,6 +50,9 @@ function alertDbg( function_name ) {
+ "EXTENSION: " + "\t\t\t\t\t" +
EXTENSION + "\n"
+ "BASE_URL: " + "\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
+ "LINK: " + "\t\t\t\t\t\t" + LINK
+ "\n"
+ + "CHECKSUM_ASC: " + "\t\t\t\t\t" +
CHECKSUM_ASC + "\n"
+ + "CHECKSUM_MD5: " + "\t\t\t\t\t" +
CHECKSUM_MD5 + "\n"
+ + "CHECKSUM_SHA256: " + "\t\t\t\t\t" +
CHECKSUM_SHA256 + "\n"
+ "SOURCEFORGE: " + "\t\t\t\t\t\t" +
SOURCEFORGE + "\n"
+ "OTHER: " + "\t\t\t\t\t\t" + OTHER
+ "\n"
+ "ARCHIVE: " + "\t\t\t\t\t\t" +
ARCHIVE + "\n"
@@ -127,6 +131,8 @@ function getLanguage() {
LANG_ISO = language;
LANG_ARRAY = thisLanguage;
+
+ return LANG_ISO;
}
/*
@@ -159,17 +165,8 @@ function getLink( rel_mode ) {
if ( hasMirrorLink() ) {
getFilesize();
}
- /*
- if ( NL_LANGUAGE == "" )
- NL_LANGUAGE = LANG_ISO;
- */
- /*
- Trim timestamp from version, required for RC
- if ( version.indexOf( "_" ) > -1 )
- version = version.split( "_" )[0];
- */
- // If language is supported, then provide a download link.
+ // If language is supported, then provide a download link.
if ( hasMirrorLink() ) {
// Release mode
if ( rel_mode == 1 ) {
@@ -181,8 +178,7 @@ function getLink( rel_mode ) {
FILENAME = "Apache_OpenOffice_"
+ PRE_VERSION + "_" + URL_PLATFORM + "_";
FILENAME = FILENAME + LANG_ISO +
EXTENSION;
- LINK =
SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
- LINK = LINK + "/download";
+ LINK =
SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME + "/download";
chk_link =
APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
chk_link = chk_link + FILENAME;
@@ -196,7 +192,7 @@ function getLink( rel_mode ) {
OTHER = false;
ARCHIVE = true;
ERROR = true;
- return LINK;
+// return LINK;
}
// If platform is Solaris, FreeBSD or OS/2,
@@ -212,7 +208,7 @@ function getLink( rel_mode ) {
OTHER = true;
ARCHIVE = false;
ERROR = true;
- return LINK;
+// return LINK;
}
LINK =
"http://archive.apache.org/dist/openoffice/";;
@@ -225,7 +221,7 @@ function getLink( rel_mode ) {
OTHER = true;
ARCHIVE = false;
ERROR = true;
- return LINK;
+// return LINK;
}
// If no platform was recognized, then provide a
general download link to the "other.html" webpage.
if ( URL_PLATFORM == "" ) {
@@ -239,22 +235,21 @@ function getLink( rel_mode ) {
OTHER = true;
ARCHIVE = false;
ERROR = true;
- return LINK;
+// return LINK;
}
// If platform was recognized, assemble the filenames
for download and checksums
- FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + LANG_ISO;
- FILENAME = FILENAME + EXTENSION;
+ FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
// Assign the file name (column 3) from the release
matrix of language and platform
// FILENAME = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
- // LINK = SOURCEFORGE_BASE_URL + LANG_ISO +
"/Apache_OpenOffice_" + VERSION + "_";
- // LINK = LINK + URL_PLATFORM + "_" + LANG_ISO +
EXTENSION + "/download";
+ // LINK = SOURCEFORGE_BASE_URL + LANG_ISO +
"/Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM;
+ // LINK = LINK + "_" + LANG_ISO + EXTENSION +
"/download";
LINK = SOURCEFORGE_BASE_URL + LANG_ISO + "/"
+ FILENAME + "/download";
- // chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
LANG_ISO + "/Apache_OpenOffice_";
- // chk_link = chk_link + VERSION + "_" +
URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+ // chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
LANG_ISO + "/Apache_OpenOffice_" + VERSION;
+ // chk_link = chk_link + "_" + URL_PLATFORM + "_" +
LANG_ISO + EXTENSION;
chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
LANG_ISO + "/" + FILENAME;
CHECKSUM_KEYS =
"https://people.apache.org/keys/group/openoffice.asc";;
@@ -274,7 +269,7 @@ function getLink( rel_mode ) {
OTHER = false;
ARCHIVE = false;
ERROR = false;
- return LINK;
+// return LINK;
} else {
// Beta release mode
// If platform is too old, then provide a general
download link to the archive.
@@ -284,8 +279,7 @@ function getLink( rel_mode ) {
FILENAME = "Apache_OpenOffice_"
+ PRE_VERSION + "_" + URL_PLATFORM + "_";
FILENAME = FILENAME + LANG_ISO +
EXTENSION;
- LINK =
SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
- LINK = LINK + "/download";
+ LINK =
SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME + "/download";
chk_link =
APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
chk_link = chk_link + FILENAME;
@@ -299,7 +293,7 @@ function getLink( rel_mode ) {
OTHER = false;
ARCHIVE = true;
ERROR = true;
- return LINK;
+// return LINK;
}
LINK =
"http://www.openoffice.org/download/all_beta.html";;
@@ -307,12 +301,11 @@ function getLink( rel_mode ) {
OTHER = true;
ARCHIVE = false;
ERROR = true;
- return LINK;
+// return LINK;
}
// If platform was recognized, assemble the filenames
for download and checksums
- FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + LANG_ISO;
- FILENAME = FILENAME + EXTENSION;
+ FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
// Assign the file name (column 3) from the release
matrix of language and platform
// FILENAME = release_matrix_410_beta[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
@@ -335,20 +328,23 @@ function getLink( rel_mode ) {
OTHER = false;
ARCHIVE = false;
ERROR = false;
- return LINK;
+// return LINK;
} else {
+ // If language is not supported, then provide an alternative
download link.
// Release mode
if ( rel_mode == 1 ) {
- // If language is not supported, then provide the link
from the Native Language (NL) group.
- LINK = LANG_ARRAY[ 4 ];
+ // Provide the link from the Native Language (NL) group.
+ LINK = LANG_ARRAY[ 4 ];
} else {
// Beta release mode
- // If language is not supported, then provide the
"all_beta.html" as download link.
- LINK =
"http://www.openoffice.org/download/all_beta.html";;
+ // Provide the "all_beta.html" as download link.
+ LINK =
"http://www.openoffice.org/download/all_beta.html";;
}
- ERROR = true;
- return LINK;
+ ERROR = true;
+// return LINK;
}
+
+ return LINK;
}
/*
@@ -513,7 +509,7 @@ function getPlatform() {
ERROR = true;
}
- return;
+ return URL_PLATFORM;
}
/*
