Author: marcus
Date: Thu May 29 18:04:03 2014
New Revision: 1598349
URL: http://svn.apache.org/r1598349
Log:
Updated variables and text, improved assembling for filename, filesize and
release data
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598349&r1=1598348&r2=1598349&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 18:04:03 2014
@@ -23,6 +23,7 @@
* function getPlatform ()
* function getReleaseMatrixPos ()
* function getFilename ( ver )
+ * function getFileData ( ver )
* function getFilesize ( ver )
* function openItem ( itemid, uri )
* function alertDbg ( location )
@@ -76,10 +77,10 @@ function initVars() {
UI_PLATFORM_NO_SUP = ""; // The platform as
readable string, if not supported
URL_PLATFORM = ""; // The platform as
part of the download URL
OLD_PLATFORM = false; // Is the browser
platform old (true) or not (false)?
- RELEASE_MATRIX_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM = ""; // The platform in the
release matrix array
- RELEASE_MATRIX_LANG = ""; // The language
specific data depending on LANG_ISO
+ RELEASE_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM = ""; // The platform in the
release matrix array
+ RELEASE_LANG = ""; // The language
specific data depending on LANG_ISO
LANG_SEL = ""; // The selected
language as ISO code from drop-down-box
PLATFORM_SEL = ""; // The selected
platform from drop-down-box
VERSION_SEL = ""; // The selected
version from drop-down-box
@@ -88,6 +89,7 @@ function initVars() {
FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
FILESIZE_LP = 0; // The filesize of the
download file (for language pack)
EXTENSION = ""; // The file extension
of the download URL
+ REL_TEXT = ""; // The release data
(milestone, build ID, svn rev, release date)
// TYPE = ""; // The installation
type
// LINK = ""; // The complete
download URL
LINK_FULL = ""; // The complete
download URL (for full installation)
@@ -198,8 +200,8 @@ function getLanguage() {
LANG_ISO = language;
LANG_ARRAY = thisLanguage;
- var thisReleaseMatrixSet = release_matrix_410[ LANG_ISO ];
- RELEASE_MATRIX_LANG = thisReleaseMatrixSet[ 0 ];
+ var thisReleaseMatrixSet = release_410[ LANG_ISO ];
+ RELEASE_LANG = thisReleaseMatrixSet[ 0 ];
/*
alert( ""
+ "getLanguage() : End" + "\n\n"
@@ -945,25 +947,26 @@ function isLangSupported() {
switch( VERSION_SEL ) {
case "4.1.0":
- RELEASE_MATRIX_LANG = release_matrix_410[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_410[ LANG_ISO ][ 0 ];
break;
case "4.0.1":
- RELEASE_MATRIX_LANG = release_matrix_401[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_401[ LANG_ISO ][ 0 ];
break;
case "4.0.0":
- // Todo: Implement a "release_matrix_400" array in the
"release_matrix.js" file.
-// RELEASE_MATRIX_LANG = release_matrix_400[ LANG_ISO ][ 0
];
+ // Todo: Implement a "release_400" array in the
"release_matrix.js" file.
+
+ RELEASE_LANG = release_400[ LANG_ISO ][ 0 ];
break;
default:
- RELEASE_MATRIX_LANG = "";
+ RELEASE_LANG = "";
ERROR = true;
}
// if( LANG_ARRAY[ 3 ] == 'y' ) {
- if( RELEASE_MATRIX_LANG[ 3 ] == 'y' ) {
+ if( RELEASE_LANG[ 3 ] == 'y' ) {
return true;
} else {
- NOT_AVAILABLE = RELEASE_MATRIX_LANG[ 1 ] + " is not available";
+ NOT_AVAILABLE = RELEASE_LANG[ 1 ] + " is not available";
ERROR = true;
return false;
}
@@ -995,8 +998,9 @@ function getLink( rel_mode ) {
// If platform is 'Mac OS X <= 10.6', provide a
download link with previous AOO version.
if( UI_PLATFORM == "Mac OS X (<= 10.6)" ) {
getReleaseMatrixPos()
- getFilesize( PREV_VERSION );
- getFilename( PREV_VERSION );
+// getFilesize( PREV_VERSION );
+// getFilename( PREV_VERSION );
+ getFileData( PREV_VERSION );
SOURCEFORGE_PREV_URL = SOURCEFORGE +
PREV_VERSION + "/binaries/";
ASF_DIST_PREV_URL = ASF_DIST +
PREV_VERSION;
@@ -1075,8 +1079,9 @@ function getLink( rel_mode ) {
// If language is supported and platform was recognized,
assemble the filenames for download and checksums.
getReleaseMatrixPos()
- getFilesize( VERSION );
- getFilename( VERSION );
+// getFilesize( VERSION );
+// getFilename( VERSION );
+ getFileData( VERSION );
SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION +
"/binaries/";
// ASF_DIST_BASE_URL = ASF_DIST + VERSION;
@@ -1106,7 +1111,7 @@ function getLink( rel_mode ) {
// Release mode
// Provide the link from the Native Language (NL) group.
// LINK_FULL = LANG_ARRAY[ 4 ];
- LINK_FULL = "http://www.openoffice.org/"; +
RELEASE_MATRIX_LANG[ 3 ];
+ LINK_FULL = "http://www.openoffice.org/"; +
RELEASE_LANG[ 3 ];
} else {
// Beta release mode
// Provide the "all_beta.html" as download link.
@@ -1128,7 +1133,7 @@ function getLink( rel_mode ) {
* Depends on chosen OS, language and type
*/
function getLinkSel( rel_mode ) {
- var error_text, rel_text = "";
+ var error_text;
// Reset all error flags.
SF = false;
@@ -1141,6 +1146,7 @@ function getLinkSel( rel_mode ) {
rel_mode = 1;
// Get the selected data from the drop-down-boxes.
+
getOSSel();
getLangSel();
getVerSel();
@@ -1178,7 +1184,7 @@ function getLinkSel( rel_mode ) {
if( VERSION_SEL == "4.1.0" && URL_PLATFORM == "MacOS_x86_install" ) {
// Show an error message that the chosen items do not lead to a
download.
error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + UI_PLATFORM + "</b>."
- + "<br />Please select version 4.0.1 or older.";
+ + "<br />Please select version 4.0.1.";
showErrorMessage( error_text );
@@ -1202,7 +1208,7 @@ function getLinkSel( rel_mode ) {
// Release mode
// Provide the link from the Native Language (NL) group.
// LINK_FULL = LANG_ARRAY[ 4 ];
- LINK_FULL = "http://www.openoffice.org/"; +
RELEASE_MATRIX_LANG[ 3 ];
+ LINK_FULL = "http://www.openoffice.org/"; +
RELEASE_LANG[ 3 ];
LINK_LP = LINK_LP;
FILESIZE_FULL = 0;
FILESIZE_LP = 0;
@@ -1213,8 +1219,8 @@ function getLinkSel( rel_mode ) {
LINK_LP = LINK_LP;
}
// Show an error message that the chosen items do not lead to a
download.
- error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + RELEASE_MATRIX_LANG[ 1 ]
- + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")</b>.<br
/>Please choose another language or version.";
+ error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + RELEASE_LANG[ 1 ]
+ + " (" + RELEASE_LANG[ 2 ] + ")</b>.<br />Please
choose another language or version.";
showErrorMessage( error_text );
@@ -1223,8 +1229,9 @@ function getLinkSel( rel_mode ) {
// If language is supported, assemble the filenames and text
for download and checksums.
getReleaseMatrixPos();
- getFilesize( VERSION_SEL );
- getFilename( VERSION_SEL );
+// getFilesize( VERSION_SEL );
+// getFilename( VERSION_SEL );
+ getFileData( VERSION_SEL );
SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION_SEL + "/binaries/";
// ASF_DIST_BASE_URL = ASF_DIST + VERSION_SEL;
@@ -1257,7 +1264,7 @@ function getLinkSel( rel_mode ) {
ARCHIVE = false;
ERROR = false;
- rel_text = "Milestone " + MILESTONE + " | Build ID " + BUILD +
" | SVN " + SVN_REV + " | Released: " + REL_DATE;
+// rel_text = "Milestone " + MILESTONE + " | Build ID " + BUILD +
" | SVN " + SVN_REV + " | Released: " + REL_DATE;
// Set the values for the both download text buttons.
document.getElementById( "dl_f_lnk" ).href =
LINK_FULL;
@@ -1269,10 +1276,10 @@ function getLinkSel( rel_mode ) {
// Set the values in the sub-green box on the left hand side.
document.getElementById( "dl_rel_dta_hl" ).innerHTML =
"Release data: ";
- document.getElementById( "dl_rel_dta" ).innerHTML =
rel_text;
+ document.getElementById( "dl_rel_dta" ).innerHTML =
REL_TEXT;
document.getElementById( "dl_f_hl" ).innerHTML = "Full
installation: ";
- document.getElementById( "dl_f_size_hl" ).innerHTML =
"Filesize ~ ";
- document.getElementById( "dl_f_size" ).innerHTML =
FILESIZE_FULL + " MByte";
+ document.getElementById( "dl_f_size_hl" ).innerHTML =
"Filesize ~";
+ document.getElementById( "dl_f_size" ).innerHTML =
" " + FILESIZE_FULL + " MByte";
document.getElementById( "space1" ).innerHTML = " | ";
document.getElementById( "dl_f_chk_hl" ).innerHTML =
"Signatures and hashes: ";
document.getElementById( "dl_f_chk_keys" ).href =
LINK_CHK_KEYS;
@@ -1295,8 +1302,8 @@ function getLinkSel( rel_mode ) {
document.getElementById( "dl_chk_verify" ).innerHTML = "How
to verify?";
document.getElementById( "dl_chk_verify" ).title = "How
to verify the downloaded file with checksums?";
document.getElementById( "dl_lp_hl" ).innerHTML =
"Language pack: ";
- document.getElementById( "dl_lp_size_hl" ).innerHTML =
"Filesize ~ ";
- document.getElementById( "dl_lp_size" ).innerHTML =
FILESIZE_LP + " MByte";
+ document.getElementById( "dl_lp_size_hl" ).innerHTML =
"Filesize ~";
+ document.getElementById( "dl_lp_size" ).innerHTML =
" " + FILESIZE_LP + " MByte";
document.getElementById( "space6" ).innerHTML = " | ";
document.getElementById( "dl_lp_chk_hl" ).innerHTML =
"Signatures and hashes: ";
document.getElementById( "dl_lp_chk_keys" ).href =
LINK_CHK_KEYS;
@@ -1356,6 +1363,7 @@ function getLinkSel( rel_mode ) {
document.getElementById( "dl_rpt_img" ).style.cursor
= "help";
}
+
// alertDbg( "getLinkSel(): End" );
return LINK_FULL;
@@ -1539,109 +1547,143 @@ function getReleaseMatrixPos() {
switch( URL_PLATFORM ) {
case "Linux_x86-64_install-deb":
case "Linux_x86-64_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 1;
- RELEASE_MATRIX_PLATFORM_POS_LP = 2;
+ RELEASE_PLATFORM_POS_FULL = 1;
+ RELEASE_PLATFORM_POS_LP = 2;
break;
case "Linux_x86-64_install-rpm":
case "Linux_x86-64_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 3;
- RELEASE_MATRIX_PLATFORM_POS_LP = 4;
+ RELEASE_PLATFORM_POS_FULL = 3;
+ RELEASE_PLATFORM_POS_LP = 4;
break;
case "Linux_x86_install-deb":
case "Linux_x86_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 5;
- RELEASE_MATRIX_PLATFORM_POS_LP = 6;
+ RELEASE_PLATFORM_POS_FULL = 5;
+ RELEASE_PLATFORM_POS_LP = 6;
break;
case "Linux_x86_install-rpm":
case "Linux_x86_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 7;
- RELEASE_MATRIX_PLATFORM_POS_LP = 8;
+ RELEASE_PLATFORM_POS_FULL = 7;
+ RELEASE_PLATFORM_POS_LP = 8;
break;
case "MacOS_x86-64_install":
case "MacOS_x86-64_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
- RELEASE_MATRIX_PLATFORM_POS_LP = 10;
+ RELEASE_PLATFORM_POS_FULL = 9;
+ RELEASE_PLATFORM_POS_LP = 10;
break;
case "MacOS_x86_install":
case "MacOS_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
- RELEASE_MATRIX_PLATFORM_POS_LP = 10;
+ RELEASE_PLATFORM_POS_FULL = 9;
+ RELEASE_PLATFORM_POS_LP = 10;
break;
case "Win_x86_install":
case "Win_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 11;
- RELEASE_MATRIX_PLATFORM_POS_LP = 12;
+ RELEASE_PLATFORM_POS_FULL = 11;
+ RELEASE_PLATFORM_POS_LP = 12;
break;
default:
- RELEASE_MATRIX_PLATFORM_POS_FULL = -1;
- RELEASE_MATRIX_PLATFORM_POS_LP = -1;
- ERROR = true;
+ RELEASE_PLATFORM_POS_FULL = -1;
+ RELEASE_PLATFORM_POS_LP = -1;
+ ERROR = true;
}
- return RELEASE_MATRIX_PLATFORM_POS_FULL;
+ return RELEASE_PLATFORM_POS_FULL;
}
/*
* Get file name for download file
* Depends on version and array-list of "release_matrix.js"
*/
-function getFilename( ver ) {
+// function getFilename( ver ) {
+function getFileData( ver ) {
// Depending on $ver, a different release matrix has to be used to
assemble the download filenames.
switch( ver ) {
case "4.1.0":
// Assign all values from the release matrix of
language and platform.
- RELEASE_MATRIX_PLATFORM = release_matrix_410[ LANG_ISO
][ RELEASE_MATRIX_PLATFORM_POS_FULL ];
+ RELEASE_PLATFORM = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ];
// Assemble filename for download from release matrix
of language and platform (column 0).
// Product name + version + platform as URL part +
language ISO + file extension.
FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 0 ] + "_"
+ LANG_ISO + EXTENSION;
FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 0 ] + "_"
+ LANG_ISO + EXTENSION;
+
+ // Assign the file size (column 2) from the release
matrix of language and platform.
+ FILESIZE_FULL = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
+
+ // Assign all values from the release data.
+ REL_TEXT = "Milestone " + release_410[ "src"
][ 1 ][ 0 ]
+ + " | Build ID " + release_410[ "src"
][ 1 ][ 1 ]
+ + " | SVN " + release_410[ "src"
][ 1 ][ 2 ]
+ + " | Released " + release_410[ "src"
][ 1 ][ 3 ];
break;
case "4.0.1":
// Assign all values from the release matrix of
language and platform.
- RELEASE_MATRIX_PLATFORM = release_matrix_401[ LANG_ISO
][ RELEASE_MATRIX_PLATFORM_POS_FULL ];
+ RELEASE_PLATFORM = release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ];
// Assemble filename for download from release matrix
of language and platform (column 0).
// Product name + version + platform as URL part +
language ISO + file extension.
FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 0 ] + "_"
+ LANG_ISO + EXTENSION;
FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 0 ] + "_"
+ LANG_ISO + EXTENSION;
+
+ // Assign the file size (column 2) from the release
matrix of language and platform.
+ FILESIZE_FULL = release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
+
+ // Assign all values from the release data.
+ REL_TEXT = "Milestone " + release_401[ "src"
][ 1 ][ 0 ]
+ + " | Build ID " + release_401[ "src"
][ 1 ][ 1 ]
+ + " | SVN " + release_401[ "src"
][ 1 ][ 2 ]
+ + " | Released " + release_401[ "src"
][ 1 ][ 3 ];
break;
case "4.0.0":
+ // Todo: Implement a "release_400" array in the
"release_matrix.js" file.
+
// Assign all values from the release matrix of
language and platform.
-// RELEASE_MATRIX_PLATFORM = release_matrix_400[ LANG_ISO
][ RELEASE_MATRIX_PLATFORM_POS_FULL ];
+ RELEASE_PLATFORM = release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ];
- // Todo: Implement a "release_matrix_400" array in the
"release_matrix.js" file.
-// FILENAME_FULL = "Apache_OpenOffice_" + ver + "_";
-// FILENAME_FULL = FILENAME_FULL +
release_matrix_400[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
-// FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO +
EXTENSION;
-// FILENAME_LP = "Apache_OpenOffice_" + ver + "_";
-// FILENAME_LP = FILENAME_LP +
release_matrix_400[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
-// FILENAME_LP = FILENAME_LP + "_" + LANG_ISO +
EXTENSION;
- FILENAME_FULL = "";
- FILENAME_LP = "";
- ERROR = true;
+ // Assemble filename for download from release matrix
of language and platform (column 0).
+ // Product name + version + platform as URL part +
language ISO + file extension.
+ FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
+ + release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
+ FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
+ + release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
+
+ // Assign the file size (column 2) from the release
matrix of language and platform.
+ FILESIZE_FULL = release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
+
+ // Assign all values from the release data.
+ REL_TEXT = "Milestone " + release_400[ "src"
][ 1 ][ 0 ]
+ + " | Build ID " + release_400[ "src"
][ 1 ][ 1 ]
+ + " | SVN " + release_400[ "src"
][ 1 ][ 2 ]
+ + " | Released " + release_400[ "src"
][ 1 ][ 3 ];
break;
default:
FILENAME_FULL = "";
FILENAME_LP = "";
+ FILESIZE_FULL = 0;
+ FILESIZE_LP = 0;
+ REL_TEXT = "Milestone ? | Build ID ? | SVN ? |
Released ?";
ERROR = true;
}
/*
// Assemble the filename for download from the release matrix of
language and platform (column 0).
// Product name + version + platform as URL part + language ISO + file
extension.
FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + release_410[ LANG_ISO ][ RELEASE_PLATFORM_POS_FULL ][
0 ] + "_"
+ LANG_ISO + EXTENSION;
FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
- + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + release_410[ LANG_ISO ][ RELEASE_PLATFORM_POS_LP ][
0 ] + "_"
+ LANG_ISO + EXTENSION;
*/
// alert( ver + "\n\n" + FILENAME_FULL + "\n\n" + FILENAME_LP );
@@ -1659,66 +1701,65 @@ function getFilesize( ver ) {
switch( URL_PLATFORM ) {
case "Linux_x86-64_install-deb":
case "Linux_x86-64_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 1;
- RELEASE_MATRIX_PLATFORM_POS_LP = 2;
+ RELEASE_PLATFORM_POS_FULL = 1;
+ RELEASE_PLATFORM_POS_LP = 2;
break;
case "Linux_x86-64_install-rpm":
case "Linux_x86-64_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 3;
- RELEASE_MATRIX_PLATFORM_POS_LP = 4;
+ RELEASE_PLATFORM_POS_FULL = 3;
+ RELEASE_PLATFORM_POS_LP = 4;
break;
case "Linux_x86_install-deb":
case "Linux_x86_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 5;
- RELEASE_MATRIX_PLATFORM_POS_LP = 6;
+ RELEASE_PLATFORM_POS_FULL = 5;
+ RELEASE_PLATFORM_POS_LP = 6;
break;
case "Linux_x86_install-rpm":
case "Linux_x86_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 7;
- RELEASE_MATRIX_PLATFORM_POS_LP = 8;
+ RELEASE_PLATFORM_POS_FULL = 7;
+ RELEASE_PLATFORM_POS_LP = 8;
break;
case "MacOS_x86-64_install":
case "MacOS_x86-64_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
- RELEASE_MATRIX_PLATFORM_POS_LP = 10;
+ RELEASE_PLATFORM_POS_FULL = 9;
+ RELEASE_PLATFORM_POS_LP = 10;
break;
case "MacOS_x86_install":
case "MacOS_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
- RELEASE_MATRIX_PLATFORM_POS_LP = 10;
+ RELEASE_PLATFORM_POS_FULL = 9;
+ RELEASE_PLATFORM_POS_LP = 10;
break;
case "Win_x86_install":
case "Win_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 11;
- RELEASE_MATRIX_PLATFORM_POS_LP = 12;
+ RELEASE_PLATFORM_POS_FULL = 11;
+ RELEASE_PLATFORM_POS_LP = 12;
break;
default:
- RELEASE_MATRIX_PLATFORM_POS_FULL = 0;
- RELEASE_MATRIX_PLATFORM_POS_LP = 0;
- ERROR = true;
+ RELEASE_PLATFORM_POS_FULL = -1;
+ RELEASE_PLATFORM_POS_LP = -1;
+ ERROR = true;
}
*/
// If a platform was found and no error occurred, assign the array data
and filesize from the release matrix.
- if( RELEASE_MATRIX_PLATFORM_POS_FULL > -1 && !ERROR ) {
+ if( RELEASE_PLATFORM_POS_FULL > -1 && !ERROR ) {
// Depending on $ver, a different release matrix has to be used
to get the filesizes.
switch( ver ) {
case "4.1.0":
// Assign the file size (column 2) from the
release matrix of language and platform.
- FILESIZE_FULL = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ];
- FILESIZE_LP = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ];
+ FILESIZE_FULL = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
break;
case "4.0.1":
// Assign the file size (column 2) from the
release matrix of language and platform.
- FILESIZE_FULL = release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ];
- FILESIZE_LP = release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ];
+ FILESIZE_FULL = release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_401[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
break;
case "4.0.0":
- // Todo: Implement a "release_matrix_400" array
in the "release_matrix.js" file.
-// FILESIZE_FULL = release_matrix_400[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ];
-// FILESIZE_LP = release_matrix_400[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ];
- FILESIZE_FULL = 0;
- FILESIZE_LP = 0;
- ERROR = true;
+ // Todo: Implement a "release_400" array in the
"release_matrix.js" file.
+
+ // Assign the file size (column 2) from the
release matrix of language and platform.
+ FILESIZE_FULL = release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_400[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
break;
default:
FILESIZE_FULL = 0;
@@ -1727,11 +1768,11 @@ function getFilesize( ver ) {
}
/*
// Assign all values from the release matrix of language and
platform.
- RELEASE_MATRIX_PLATFORM = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ];
+ RELEASE_PLATFORM = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ];
// Assign the file size (column 2) from the release matrix of
language and platform.
- FILESIZE_FULL = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ];
- FILESIZE_LP = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ];
+ FILESIZE_FULL = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_FULL ][ 2 ];
+ FILESIZE_LP = release_410[ LANG_ISO ][
RELEASE_PLATFORM_POS_LP ][ 2 ];
*/
} else {
FILESIZE_FULL = 0;
@@ -1763,10 +1804,10 @@ function alertDbg( location ) {
+ "NL_LANG: " + "\t\t\t\t\t\t\t" +
NL_LANG + "\n"
+ "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
+ "LANG_ARRAY: " + "\t\t\t\t\t\t" +
LANG_ARRAY + "\n"
- + "RELEASE_MATRIX_PLATFORM_POS_FULL: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS_FULL + "\n"
- + "RELEASE_MATRIX_PLATFORM_POS_LP: " + "\t\t" +
RELEASE_MATRIX_PLATFORM_POS_LP + "\n"
- + "RELEASE_MATRIX_PLATFORM: " + "\t\t\t" +
RELEASE_MATRIX_PLATFORM + "\n"
- + "RELEASE_MATRIX_LANG: " + "\t\t\t\t" +
RELEASE_MATRIX_LANG + "\n"
+ + "RELEASE_PLATFORM_POS_FULL: " + "\t\t\t" +
RELEASE_PLATFORM_POS_FULL + "\n"
+ + "RELEASE_PLATFORM_POS_LP: " + "\t\t\t" +
RELEASE_PLATFORM_POS_LP + "\n"
+ + "RELEASE_PLATFORM: " + "\t\t\t\t\t" +
RELEASE_PLATFORM + "\n"
+ + "RELEASE_LANG: " + "\t\t\t\t\t\t" +
RELEASE_LANG + "\n"
+ "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
+ "UI_PLATFORM_NO_SUP: " + "\t\t\t\t" +
UI_PLATFORM_NO_SUP + "\n"
+ "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
@@ -1782,16 +1823,16 @@ function alertDbg( location ) {
// + "TYPE: " + "\t\t\t\t\t\t" + TYPE
+ "\n"
+ "SOURCEFORGE_BASE_URL: " + "\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
+ "ASF_DIST_BASE_URL: " + "\t\t\t\t" +
ASF_DIST_BASE_URL + "\n"
- + "ASF_ARC_BASE_URL: " + "\t\t\t\t" +
ASF_ARC_BASE_URL + "\n"
+ + "ASF_ARC_BASE_URL: " + "\t\t\t\t\t" +
ASF_ARC_BASE_URL + "\n"
// + "LINK: " + "\t\t\t\t\t\t" + LINK
+ "\n"
+ "LINK_FULL: " + "\t\t\t\t\t\t" +
LINK_FULL + "\n"
+ "LINK_LP: " + "\t\t\t\t\t\t\t" +
LINK_LP + "\n"
- + "LINK_CHECKSUM_ASC_FULL: " + "\t\t\t" +
LINK_CHECKSUM_ASC_FULL + "\n"
- + "LINK_CHECKSUM_MD5_FULL: " + "\t\t\t" +
LINK_CHECKSUM_MD5_FULL + "\n"
- + "LINK_CHECKSUM_SHA256_FULL: " + "\t\t\t" +
LINK_CHECKSUM_SHA256_FULL + "\n"
- + "LINK_CHECKSUM_ASC_LP: " + "\t\t\t\t" +
LINK_CHECKSUM_ASC_LP + "\n"
- + "LINK_CHECKSUM_MD5_LP: " + "\t\t\t\t" +
LINK_CHECKSUM_MD5_LP + "\n"
- + "LINK_CHECKSUM_SHA256_LP: " + "\t\t\t" +
LINK_CHECKSUM_SHA256_LP + "\n"
+ + "LINK_CHK_ASC_FULL: " + "\t\t\t\t\t" +
LINK_CHK_ASC_FULL + "\n"
+ + "LINK_CHK_MD5_FULL: " + "\t\t\t\t\t" +
LINK_CHK_MD5_FULL + "\n"
+ + "LINK_CHK_SHA256_FULL: " + "\t\t\t\t" +
LINK_CHK_SHA256_FULL + "\n"
+ + "LINK_CHK_ASC_LP: " + "\t\t\t\t\t" +
LINK_CHK_ASC_LP + "\n"
+ + "LINK_CHK_MD5_LP: " + "\t\t\t\t\t" +
LINK_CHK_MD5_LP + "\n"
+ + "LINK_CHK_SHA256_LP: " + "\t\t\t\t" +
LINK_CHK_SHA256_LP + "\n"
+ "SF: " + "\t\t\t\t\t\t\t\t" + SF
+ "\n"
+ "OTHER: " + "\t\t\t\t\t\t\t" + OTHER
+ "\n"
+ "ARCHIVE: " + "\t\t\t\t\t\t\t" +
ARCHIVE + "\n"
