Author: marcus
Date: Mon Apr 28 20:24:52 2014
New Revision: 1590779
URL: http://svn.apache.org/r1590779
Log:
Let the release matrix values start with '1' instead of '0', to avoid errors
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=1590779&r1=1590778&r2=1590779&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Apr 28 20:24:52 2014
@@ -24,8 +24,8 @@ function initVars() {
LANG_ISO = ""; // The language as ISO
code
LANG_ARRAY = ""; // This array contains
all language specific data
- RELEASE_MATRIX_PLATFORM_POS_FULL = -1; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM_POS_LP = -1; // The position of the
platform in the release matrix array
+ 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
UI_PLATFORM = ""; // The platform as
readable string
URL_PLATFORM = ""; // The platform as
part of the download URL
@@ -53,6 +53,31 @@ function initVars() {
}
/*
+ * Output values of variables for debugging
+ */
+function alertDbg( function_name ) {
+ alert ( ""
+ + function_name
+ "\n"
+ + "LANG_ISO: " + "\t\t\t\t\t" +
LANG_ISO + "\n"
+ + "UI_PLATFORM: " + "\t\t\t\t\t" +
UI_PLATFORM + "\n"
+ + "URL_PLATFORM: " + "\t\t\t\t\t" +
URL_PLATFORM + "\n"
+ + "EXTENSION: " + "\t\t\t\t\t" +
EXTENSION + "\n"
+ + "RELEASE_MATRIX_PLATFORM_POS_FULL: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS_FULL + "\n"
+ + "RELEASE_MATRIX_PLATFORM_POS_LP: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS_LP + "\n"
+ + "RELEASE_MATRIX_PLATFORM: " + "\t\t\t" +
RELEASE_MATRIX_PLATFORM + "\n"
+ + "FILENAME_FULL: " + "\t\t\t\t" +
FILENAME_FULL + "\n"
+ + "FILENAME_LP: " + "\t\t\t\t\t" +
FILENAME_LP + "\n"
+ + "FILESIZE_FULL: " + "\t\t\t\t\t" +
FILESIZE_FULL + "\n"
+ + "FILESIZE_LP: " + "\t\t\t\t\t" +
FILESIZE_LP + "\n"
+ + "BASE_URL: " + "\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
+ + "LINK: " + "\t\t\t\t\t\t" + LINK
+ "\n"
+ + "LINK_FULL: " + "\t\t\t\t\t" +
LINK_FULL + "\n"
+ + "LINK_LP: " + "\t\t\t\t\t\t" +
LINK_LP + "\n"
+ + "ERROR: " + "\t\t\t\t\t\t" + ERROR
+ "\n"
+ + "" );
+}
+
+/*
* Get array and ISO code for language
* Depends on array-list and $NL_LANGUAGE
*/
@@ -381,7 +406,7 @@ function resetSel() {
document.getElementById( "dl_help" ).href = "";
document.getElementById( "dl_help" ).text = "";
document.getElementById( "dl_help" ).title = "";
- document.getElementById( "dl_full_chk_headline" ).text = "";
+/* document.getElementById( "dl_full_chk_headline" ).text = "";
document.getElementById( "space1" ).text = "";
document.getElementById( "space2" ).text = "";
document.getElementById( "space3" ).text = "";
@@ -417,6 +442,7 @@ function resetSel() {
document.getElementById( "dl_chk_verify" ).href = "";
document.getElementById( "dl_chk_verify" ).text = "";
document.getElementById( "dl_chk_verify" ).title = "";
+*/
}
/*
@@ -686,71 +712,10 @@ function getLinkAlt( rel_mode ) {
// reset all global variables
initVars();
-/*
- alert ( ""
- + "getLinkAlt()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t" +
EXTENSION + "\n"
- + "RELEASE_MATRIX_PLATFORM_POS_FULL: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS_FULL + "\n"
- + "RELEASE_MATRIX_PLATFORM_POS_LP: " + "\t" +
RELEASE_MATRIX_PLATFORM_POS_LP + "\n"
- + "RELEASE_MATRIX_PLATFORM: " + "\t\t\t" +
RELEASE_MATRIX_PLATFORM + "\n"
- + "FILENAME_FULL: " + "\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\t\t\t\t\t" + LINK
+ "\n"
- + "LINK_FULL: " + "\t\t\t\t\t" +
LINK_FULL + "\n"
- + "LINK_LP: " + "\t\t\t\t\t\t" +
LINK_LP + "\n"
- + "ERROR: " + "\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
+
getSelOS();
-/*
- alert ( ""
- + "getLinkAlt()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
getSelLang();
-/*
- alert ( ""
- + "getLinkAlt()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
+
if ( URL_PLATFORM == "" || LANG_ISO == "" ) {
// When no OS or language was chosen, let the user choose again.
@@ -768,9 +733,11 @@ function getLinkAlt( rel_mode ) {
// if ( URL_PLATFORM != "" && LANG_ISO != "" && TYPE != "" ) {
if ( URL_PLATFORM != "" && LANG_ISO != "" ) {
- if ( LANG_ISO != "" && RELEASE_MATRIX_PLATFORM_POS_FULL != "" )
{
+ if ( LANG_ISO != "" && RELEASE_MATRIX_PLATFORM_POS_FULL > 0 ) {
// If platform was recognized, assemble the filenames
for download and checksums.
+ alertDbg( "getLinkAlt()" );
+
// Assign the file name (column 3) from the release
matrix of language and platform.
FILENAME_FULL = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 3 ];
FILENAME_LP = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 3 ];
@@ -814,7 +781,7 @@ function getLinkAlt( rel_mode ) {
document.getElementById( "dl_help" ).href =
"http://www.openoffice.org/download/other.html#aoo";;
document.getElementById( "dl_help" ).text = "What
is the difference?";
document.getElementById( "dl_help" ).title = "What
is the difference?";
- document.getElementById( "dl_full_chk_headline" ).text =
"Signatures and hashes for full installation : ";
+/* document.getElementById( "dl_full_chk_headline" ).text =
"Signatures and hashes for full installation : ";
document.getElementById( "space1" ).text = " , ";
document.getElementById( "space2" ).text = " , ";
document.getElementById( "space3" ).text = " , ";
@@ -850,31 +817,11 @@ function getLinkAlt( rel_mode ) {
document.getElementById( "dl_chk_verify" ).href =
"../checksums.html";
document.getElementById( "dl_chk_verify" ).text = "How
to verify?";
document.getElementById( "dl_chk_verify" ).title = "How
to verify the download with checksums?";
- }
-/*
- alert ( ""
- + "getLinkAlt()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "CHECKSUM_KEYS: " + "\t\t\t\t\t\t\t" +
CHECKSUM_KEYS + "\n"
- + "CHECKSUM_ASC_FULL: " + "\t\t\t\t\t\t\t" +
CHECKSUM_ASC_FULL + "\n"
- + "CHECKSUM_ASC_LP: " + "\t\t\t\t\t\t\t" +
CHECKSUM_ASC_LP + "\n"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
*/
+ }
+
+ alertDbg( "getLinkAlt()" );
+
return;
}
@@ -1051,90 +998,50 @@ function getPlatform( rel_mode ) {
*/
function getFilesize( rel_mode ) {
// Depending on $URL_PLATFORM assign the platform position of the
release matrix
-/*
- alert ( ""
- + "getFilesize()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
+
switch ( URL_PLATFORM ) {
case "Linux_x86-64_install-deb":
case "Linux_x86-64_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 0;
- RELEASE_MATRIX_PLATFORM_POS_LP = 1;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 1;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 2;
break;
case "Linux_x86-64_install-rpm":
case "Linux_x86-64_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 2;
- RELEASE_MATRIX_PLATFORM_POS_LP = 3;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 3;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 4;
break;
case "Linux_x86_install-deb":
case "Linux_x86_langpack-deb":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 4;
- RELEASE_MATRIX_PLATFORM_POS_LP = 5;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 5;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 6;
break;
case "Linux_x86_install-rpm":
case "Linux_x86_langpack-rpm":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 6;
- RELEASE_MATRIX_PLATFORM_POS_LP = 7;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 7;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 8;
break;
case "MacOS_x86-64_install":
case "MacOS_x86-64_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 8;
- RELEASE_MATRIX_PLATFORM_POS_LP = 9;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 10;
break;
case "MacOS_x86_install":
case "MacOS_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 8;
- RELEASE_MATRIX_PLATFORM_POS_LP = 9;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 9;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 10;
break;
case "Win_x86_install":
case "Win_x86_langpack":
- RELEASE_MATRIX_PLATFORM_POS_FULL = 10;
- RELEASE_MATRIX_PLATFORM_POS_LP = 11;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 11;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 12;
break;
default:
- RELEASE_MATRIX_PLATFORM_POS_FULL = -1;
- RELEASE_MATRIX_PLATFORM_POS_LP = -1;
+ RELEASE_MATRIX_PLATFORM_POS_FULL = 0;
+ RELEASE_MATRIX_PLATFORM_POS_LP = 0;
}
-/*
- alert ( ""
- + "getFilesize()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
+
// 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_MATRIX_PLATFORM_POS_FULL > 0 && !ERROR ) {
if ( rel_mode == 0 ) {
// Release mode
// Assign all values from the release matrix of
language and platform
@@ -1155,27 +1062,7 @@ function getFilesize( rel_mode ) {
FILESIZE_FULL = 0;
FILESIZE_LP = 0;
}
-/*
- alert ( ""
- + "getFilesize()"
+ "\n"
- + "LANG_ISO: " + "\t\t\t\t\t\t" +
LANG_ISO + "\n"
- + "UI_PLATFORM: " + "\t\t\t\t\t\t" +
UI_PLATFORM + "\n"
- + "URL_PLATFORM: " + "\t\t\t\t\t\t" +
URL_PLATFORM + "\n"
- + "EXTENSION: " + "\t\t\t\t\t\t" +
EXTENSION + "\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"
- + "FILENAME_FULL: " + "\t\t\t\t\t" +
FILENAME_FULL + "\n"
- + "FILENAME_LP: " + "\t\t\t\t\t\t" +
FILENAME_LP + "\n"
- + "FILESIZE_FULL: " + "\t\t\t\t\t\t" +
FILESIZE_FULL + "\n"
- + "FILESIZE_LP: " + "\t\t\t\t\t\t" +
FILESIZE_LP + "\n"
- + "BASE_URL: " + "\t\t\t\t\t\t" +
SOURCEFORGE_BASE_URL + "\n"
- + "LINK: " + "\t\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"
- + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR
+ "\n"
- + "" );
-*/
+
return;
}
