Author: marcus
Date: Sat Jul 13 16:23:23 2013
New Revision: 1502818
URL: http://svn.apache.org/r1502818
Log:
Adjusted DL logic for AOO 4.0 release
Modified:
openoffice/ooo-site/trunk/content/download/test/download.js
Modified: openoffice/ooo-site/trunk/content/download/test/download.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1502818&r1=1502817&r2=1502818&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download.js Sat Jul 13
16:23:23 2013
@@ -91,7 +91,7 @@ function getLanguage() {
LANG_ISO = language;
LANG_ARRAY = thisLanguage;
- NATIVE_LANG = thisLanguage[ 2 ];
+ LANG_NAME = thisLanguage[ 2 ];
}
/*
@@ -100,7 +100,7 @@ function getLanguage() {
*/
function hasMirrorLink() {
// if ( PLATFORM == "unknown" )
- // return false;
+ // return false;
// Check the flag in "languages.js", 'y' -> provide download link, 'n'
-> redirect to alternative webpage
if ( LANG_ARRAY[ 3 ] == 'y' )
@@ -118,7 +118,7 @@ function getLink() {
var chk_link = "";
getLanguage();
- getPlatform();
+ getPlatform();
if ( NL_LANGUAGE == "" )
NL_LANGUAGE = LANG_ISO;
@@ -128,39 +128,44 @@ function getLink() {
// version = version.split( "_" )[0];
if ( hasMirrorLink() ) {
- if ( UI_PLATFORM == "unknown" || PLATFORM == "unknown" ||
EXTENSION == "unknown" ) {
- UI_PLATFORM = "(OS unknown)";
+ if ( PLATFORM == "" ) {
+ if ( UI_PLATFORM == "" ) {
+ UI_PLATFORM = "(OS unknown)";
+ }
file_link =
"http://www.openoffice.org/download/other.html";;
return file_link;
}
- // file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE +
"/Apache_OpenOffice_";
- // file_link = file_link + VERSION + "_" + PLATFORM + "_" +
NL_LANGUAGE;
- // file_link = file_link + EXTENSION;
-
- file_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE;
- file_link = file_link + "/Apache_OpenOffice_" + VERSION + "_" +
PLATFORM;
- file_link = file_link + "_" + NL_LANGUAGE + EXTENSION;
- FILENAME = "Apache_OpenOffice_" + VERSION + "_" + PLATFORM +
"_"
- FILENAME = FILENAME + NL_LANGUAGE + EXTENSION;
-
- // chk_link = APACHE_DIST_BASE_URL + "Apache_OpenOffice_" +
VERSION + "_";
- // chk_link = chk_link + PLATFORM + "_" + NL_LANGUAGE +
EXTENSION;
-
- chk_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE;
- chk_link = chk_link + "/Apache_OpenOffice_" + VERSION + "_" +
PLATFORM;
- chk_link = chk_link + "_" + NL_LANGUAGE + EXTENSION;
+ file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE +
"/Apache_OpenOffice_" + VERSION + "_" + PLATFORM;
+ file_link = file_link + "_" + NL_LANGUAGE + EXTENSION;
+
+ FILENAME = "Apache_OpenOffice_" + VERSION + "_" +
PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
+
+ chk_link = APACHE_DIST_BASE_URL + "Apache_OpenOffice_" +
VERSION + "_" + PLATFORM;
+ chk_link = chk_link + "_" + NL_LANGUAGE + EXTENSION;
CHECKSUM_ASC = chk_link + ".asc";
CHECKSUM_MD5 = chk_link + ".md5";
- CHECKSUM_SHA256 = chk_link + ".sha256";
- // return file_link + "/download";
+ CHECKSUM_SHA256 = chk_link + ".sha256";
+
+ return file_link + "/download";
+
+ /*
+ * Used for debugging
+
+ file_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE
+ "/Apache_OpenOffice_";
+ file_link = file_link + "/Apache_OpenOffice_" + "_" +
NL_LANGUAGE + EXTENSION;
+ chk_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE
+ "/Apache_OpenOffice_" + VERSION;
+ chk_link = chk_link + "_" + PLATFORM + "_" + NL_LANGUAGE
+ EXTENSION;
return file_link;
+
+ */
} else {
- CHECKSUM_ASC = "no_checksum";
- CHECKSUM_MD5 = "no_checksum";
- CHECKSUM_SHA256 = "no_checksum";
- return LANG_ARRAY[ 4 ];
+ FILENAME = "";
+ CHECKSUM_ASC = "";
+ CHECKSUM_MD5 = "";
+ CHECKSUM_SHA256 = "";
+ return false;
}
}
@@ -181,8 +186,8 @@ function getPlatform() {
navigator.userAgent.toLowerCase().indexOf(
"mobile" ) != -1 ||
navigator.userAgent.toLowerCase().indexOf( "ce" )
!= -1 ) {
UI_PLATFORM = "Windows mobile device";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
}
} else if ( navigator.platform.toLowerCase().indexOf( "linux" )
!= -1 ) {
if ( navigator.platform.indexOf( "64" ) != -1 ) {
@@ -215,55 +220,55 @@ function getPlatform() {
}
}
} else if ( navigator.platform.toLowerCase().indexOf( "mac" )
!= -1 ) {
- UI_PLATFORM = "Mac OS Intel (DMG)";
- PLATFORM = "MacOS_x86_install";
- EXTENSION = ".dmg";
+ UI_PLATFORM = "Mac OS Intel (DMG)";
+ PLATFORM = "MacOS_x86_install";
+ EXTENSION = ".dmg";
if ( navigator.userAgent.toLowerCase().indexOf( "ppc" )
!= -1 ) {
- UI_PLATFORM = "Mac OS PPC (DMG)";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ UI_PLATFORM = "Mac OS PPC (DMG)";
+ PLATFORM = "";
+ EXTENSION = "";
}
} else if ( navigator.platform.toLowerCase().indexOf( "sunos" )
!= -1 ) {
- UI_PLATFORM = "Solaris x86 (PKG)";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ UI_PLATFORM = "Solaris x86 (PKG)";
+ PLATFORM = "";
+ EXTENSION = "";
if ( navigator.userAgent.toLowerCase().indexOf( "sun4u"
) != -1 ) {
- UI_PLATFORM = "Solaris SPARC (PKG)";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ UI_PLATFORM = "Solaris SPARC (PKG)";
+ PLATFORM = "";
+ EXTENSION = "";
}
} else if ( navigator.platform.toLowerCase().indexOf( "freebsd"
) != -1 ) {
UI_PLATFORM = "FreeBSD (PKG)";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
} else if ( navigator.platform.toLowerCase().indexOf( "os/2" )
!= -1 ) {
UI_PLATFORM = "OS/2";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
} else if ( navigator.userAgent.toLowerCase().indexOf( "iphone"
) != -1 ||
navigator.userAgent.toLowerCase().indexOf( "ipad" )
!= -1 ||
navigator.userAgent.toLowerCase().indexOf( "ipod" )
!= -1 ) {
UI_PLATFORM = "Apple mobile device
(iPhone/iPad/iPod)";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
} else if ( navigator.userAgent.toLowerCase().indexOf(
"android" ) != -1 ) {
UI_PLATFORM = "Android mobile device";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
} else if ( navigator.userAgent.toLowerCase().indexOf(
"blackberry" ) != -1 ) {
UI_PLATFORM = "Blackberry mobile device";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
} else if ( navigator.userAgent.toLowerCase().indexOf(
"symbian" ) != -1 ) {
UI_PLATFORM = "Symbian mobile device";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ PLATFORM = "";
+ EXTENSION = "";
}
} else {
// No platform / OS was recognized
- UI_PLATFORM = "unknown";
- PLATFORM = "unknown";
- EXTENSION = "unknown";
+ UI_PLATFORM = "";
+ PLATFORM = "";
+ EXTENSION = "";
}
}
