Author: buildbot
Date: Sun Aug 4 17:41:25 2013
New Revision: 872852
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 Sun Aug 4 17:41:25 2013
@@ -1 +1 @@
-1510270
+1510272
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Aug 4 17:41:25 2013
@@ -1 +1 @@
-1510270
+1510272
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 Sun Aug
4 17:41:25 2013
@@ -11,17 +11,21 @@
/*
* Define global variables
*/
-var LANG_ISO = "";
-var LANG_ARRAY = "";
-var LANG_NAME = "";
-var UI_PLATFORM = "";
-var URL_PLATFORM = "";
-var FILENAME = "";
-var EXTENSION = "";
-var CHECKSUM_KEYS = "";
-var CHECKSUM_ASC = "";
-var CHECKSUM_MD5 = "";
-var CHECKSUM_SHA256 = "";
+var LANG_ISO = "";
+var LANG_ARRAY = "";
+var LANG_NAME = "";
+var RELEASE_MATRIX_PLATFORM_POS = -1;
+var RELEASE_MATRIX_PLATFORM = "";
+var UI_PLATFORM = "";
+var URL_PLATFORM = "";
+var FILENAME = "";
+var FILESIZE = "";
+var EXTENSION = "";
+var CHECKSUM_KEYS = "";
+var CHECKSUM_ASC = "";
+var CHECKSUM_MD5 = "";
+var CHECKSUM_SHA256 = "";
+var ERROR = false;
/*
* Get array and ISO code for language
@@ -106,11 +110,12 @@ function hasMirrorLink() {
if ( LANG_ARRAY[ 3 ] == 'y' )
return true;
else
+ ERROR = true;
return false;
}
/*
- * Get link to mirror system for download-set and checksum file
+ * Get link to mirror system for download file and checksum file
* Depends on array-list
*/
function getLink() {
@@ -119,6 +124,7 @@ function getLink() {
getLanguage();
getPlatform();
+ getFilesize();
if ( NL_LANGUAGE == "" )
NL_LANGUAGE = LANG_ISO;
@@ -135,17 +141,23 @@ function getLink() {
UI_PLATFORM = "an unknown platform/OS";
}
file_link =
"http://www.openoffice.org/download/other.html";;
+ ERROR = true;
return file_link;
} else {
+ // FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + NL_LANGUAGE;
+ // FILENAME = FILENAME + EXTENSION;
- file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE +
"/Apache_OpenOffice_" + VERSION + "_";
- file_link = file_link + URL_PLATFORM + "_" +
NL_LANGUAGE + EXTENSION + "/download";
+ // Assign the file name (column 3) from the release
matrix of language and platform
+ FILENAME = release_aoo400_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 3 ]
+ // file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE +
"/Apache_OpenOffice_" + VERSION + "_";
+ // file_link = file_link + URL_PLATFORM + "_" +
NL_LANGUAGE + EXTENSION + "/download";
- FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + NL_LANGUAGE;
- FILENAME = FILENAME + EXTENSION;
+ file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE +
"/" + FILENAME;
- chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
NL_LANGUAGE + "/Apache_OpenOffice_";
- chk_link = chk_link + VERSION + "_" +
URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
+ // chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
NL_LANGUAGE + "/Apache_OpenOffice_";
+ // chk_link = chk_link + VERSION + "_" +
URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
+
+ chk_link = APACHE_DIST_BASE_URL + "/binaries/" +
NL_LANGUAGE + "/" + FILENAME;
CHECKSUM_KEYS =
"http://www.apache.org/dist/openoffice/KEYS";;
CHECKSUM_ASC = chk_link + ".asc";
@@ -163,6 +175,7 @@ function getLink() {
return file_link;
*/
} else {
+ ERROR = true;
return false;
}
}
@@ -271,16 +284,61 @@ function getPlatform() {
// Mac OS x86
if ( os.indexOf( "mac" ) != -1 ) { UI_PLATFORM
= "Mac OS 32-bit Intel (DMG)";
- URL_PLATFORM
= "MacOS_x86_install";
+ URL_PLATFORM
= "Mac_x86_install";
EXTENSION
= ".dmg";
}
}
// If variable is not filled, then nothing was recognized, set
$UI_PLATFORM to show it to the user
if ( ! UI_PLATFORM ) {
- UI_PLATFORM = "an unknown platform/OS";
- return;
+ ERROR = true;
+ UI_PLATFORM = "an unknown platform/OS";
+ }
+ return;
+}
+
+/*
+ * Get file size for download file
+ * Depends on array-list
+ */
+function getFilesize() {
+ // Depending on URL_PLATFORM assign the platform position of the
release matrix
+ switch ( URL_PLATFORM ) {
+ case "Linux_x86-64_install-deb":
+ RELEASE_MATRIX_PLATFORM_POS = 0;
+ break;
+ case "Linux_x86-64_install-rpm":
+ RELEASE_MATRIX_PLATFORM_POS = 1;
+ break;
+ case "Linux_x86_install-deb":
+ RELEASE_MATRIX_PLATFORM_POS = 4;
+ break;
+ case "Linux_x86_install-rpm":
+ RELEASE_MATRIX_PLATFORM_POS = 5;
+ break;
+ case "Mac_x86_install":
+ RELEASE_MATRIX_PLATFORM_POS = 8;
+ break;
+ case "Win_x86_install":
+ RELEASE_MATRIX_PLATFORM_POS = 10;
+ break;
+ default:
+ RELEASE_MATRIX_PLATFORM_POS = -1;
+ }
+
+ // If a platform was found, assign the array data and filesize from the
release matrix
+ if ( RELEASE_MATRIX_PLATFORM_POS > -1 ) {
+ // Assign all values from the release matrix of language and
platform
+ RELEASE_MATRIX_PLATFORM = release_aoo400_matrix[
LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
+
+ // Assign the file size (column 2) from the release matrix of
language and platform
+ FILESIZE = release_aoo400_matrix[
LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+ } else {
+ ERROR = true;
+ FILESIZE = 0;
}
+
+ return FILESIZE;
}
/*
