Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@openoffice.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1592169 -
 /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Date: Sat, 03 May 2014 10:07:15 -0000
To: commits@openoffice.apache.org
From: marcus@apache.org
Message-Id: <20140503100715.86E022388860@eris.apache.org>

Author: marcus
Date: Sat May  3 10:07:15 2014
New Revision: 1592169

URL: http://svn.apache.org/r1592169
Log:
Fixed broken base URL for creating checksum links, renamed variable to 'VERSION_SEL' to reflect its usage for the select boxes

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=1592169&r1=1592168&r2=1592169&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May  3 10:07:15 2014
@@ -50,7 +50,7 @@ function initVars() {
 	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
-	VERSION_ALT				= "";	 // The selected version from drop-down-box
+	VERSION_SEL				= "";	 // The selected version from drop-down-box
 	FILENAME_FULL				= "";	 // The complete filename of the download URL (for full installation)
 	FILENAME_LP				= "";	 // The complete filename of the download URL (for language pack)
 	FILESIZE_FULL				= 0;	 // The filesize of the download file (for full installation)
@@ -88,7 +88,7 @@ function alertDbg( function_name ) {
 	+ "UI_PLATFORM: "			+ "\t\t\t\t\t"		+ UI_PLATFORM				+ "\n"
 	+ "URL_PLATFORM: "			+ "\t\t\t\t\t"		+ URL_PLATFORM				+ "\n"
 	+ "OLD_PLATFORM: "			+ "\t\t\t\t"		+ OLD_PLATFORM				+ "\n"
-	+ "VERSION_ALT: "			+ "\t\t\t\t\t"		+ VERSION_ALT				+ "\n"
+	+ "VERSION_SEL: "			+ "\t\t\t\t\t"		+ VERSION_SEL				+ "\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"
@@ -339,13 +339,13 @@ function getVerSel() {
 
 	// If one of the first 2 <select> elements was chosen, let the user chose again.
 	if ( ver_value == "e1" || ver_value == "e2" ) {
-		VERSION_ALT = "";
+		VERSION_SEL = "";
 		return;
 	}
 	// Search through the <select> element until the chosen version is found.
 	for( i = 0; i < SEL_VER.length; i = i + 2 ) {
 		if ( SEL_VER[ i ] == ver_value ) {
-			VERSION_ALT = ver_value;
+			VERSION_SEL = ver_value;
 			break;
 		}
 	}
@@ -621,7 +621,7 @@ function getLinkSel( rel_mode ) {
 	getVerSel();
 
 //	if ( URL_PLATFORM == "" || LANG_ISO == "" ) {
-	if ( URL_PLATFORM == "" || LANG_ISO == "" || VERSION_ALT == "" ) {
+	if ( URL_PLATFORM == "" || LANG_ISO == "" || VERSION_SEL == "" ) {
 		// When OS or language was not chosen, let the user choose again.
 		// When OS, language or version was not chosen, let the user choose again.
 //		resetSel();
@@ -633,7 +633,7 @@ function getLinkSel( rel_mode ) {
 	getFilename( VERSION );
 
 //	if ( URL_PLATFORM != "" && LANG_ISO != "" ) {
-	if ( URL_PLATFORM != "" && LANG_ISO != "" && VERSION_ALT != "" ) {
+	if ( URL_PLATFORM != "" && LANG_ISO != "" && VERSION_SEL != "" ) {
 
 		if ( LANG_ISO != "" && RELEASE_MATRIX_PLATFORM_POS_FULL > -1 ) {
 			// If language and platform are recognized, assemble the filenames for download and checksums.
@@ -643,13 +643,13 @@ function getLinkSel( rel_mode ) {
 			LINK_LP			= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_LP   + "/download";
 
 			CHECKSUM_KEYS		= "https://people.apache.org/keys/group/openoffice.asc";
-			CHECKSUM_ASC_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".asc";
-			CHECKSUM_MD5_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".md5";
-			CHECKSUM_SHA256_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".sha256";
-
-			CHECKSUM_ASC_LP		= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".asc";
-			CHECKSUM_MD5_LP		= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".md5";
-			CHECKSUM_SHA256_LP	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".sha256";
+			CHECKSUM_ASC_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".asc";
+			CHECKSUM_MD5_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".md5";
+			CHECKSUM_SHA256_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".sha256";
+
+			CHECKSUM_ASC_LP		= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".asc";
+			CHECKSUM_MD5_LP		= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".md5";
+			CHECKSUM_SHA256_LP	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".sha256";
 
 			SOURCEFORGE		= true;
 			OTHER			= false;