Author: buildbot
Date: Fri May 18 22:51:11 2012
New Revision: 818233
Log:
Staging update by buildbot for openofficeorg
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/download_new_dl_aoo.js
websites/staging/ooo-site/trunk/content/download/globalvars_new_dl_aoo.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 18 22:51:11 2012
@@ -1 +1 @@
-1340295
+1340296
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 18 22:51:11 2012
@@ -1 +1 @@
-1340295
+1340296
Modified:
websites/staging/ooo-site/trunk/content/download/download_new_dl_aoo.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download_new_dl_aoo.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/download_new_dl_aoo.js Fri
May 18 22:51:11 2012
@@ -402,7 +402,7 @@ function hasMirrorLink( nl_language ) {
// alert ("Platform: -" + platform +"-");
// first check for availability
- if ( platform == 'none' ) {
+ if ( platform == "none" ) {
return false;
}
@@ -433,7 +433,6 @@ function getLink( version, nl_language,
} else {
return mirrorbrain_getLink( version, nl_language,
schema );
}
-
}
}
@@ -442,16 +441,38 @@ function getLink( version, nl_language,
function sourceforge_getLink( version, nl_language, schema ) {
var mirrorbrain_link = mirrorbrain_getLink( version, nl_language,
schema );
var sf_link = mirrorbrain_link.replace( MIRROR_MIRRORBRAIN_URL,
MIRROR_SOURCEFORGE_URL ) + '/download';
+
return sf_link;
}
function apache_getLink( version, nl_language, schema ) {
var mirrorbrain_link = mirrorbrain_getLink( version, nl_language,
schema );
- var apache_link = mirrorbrain_link.replace( MIRROR_MIRRORBRAIN_URL,
MIRROR_APACHE_REF ) ;
+ var apache_link = mirrorbrain_link.replace( MIRROR_MIRRORBRAIN_URL,
MIRROR_APACHE_URL ) ;
+
return apache_link;
}
/*
+ * get checksum file
+ * depending on which install file was recognized and assembled
+ */
+function apache_getChecksum( version, nl_language, schema, hash ) {
+ var filename = mirrorbrain_getFileName( version, nl_language, schema )
+ "." + hash;
+
+ if ( nl_language != "" )
+ language = nl_language;
+ else
+ language = getLanguageISO( nl_language );
+
+ if ( nl_language == "en-US" )
+ var link = MIRROR_APACHE_DIST_URL + APACHE_SUFFIX_STABLE +
version + "/";
+ else
+ var link = MIRROR_APACHE_DIST_URL + APACHE_SUFFIX_LOC +
language + "/" + version + "/";
+
+ return link + filename;
+}
+
+/*
* get platform of browser
* depending from mirror-system (represented by the schema)
*/
Modified:
websites/staging/ooo-site/trunk/content/download/globalvars_new_dl_aoo.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/globalvars_new_dl_aoo.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/globalvars_new_dl_aoo.js
Fri May 18 22:51:11 2012
@@ -31,10 +31,15 @@ var MIRROR_MIRRORBRAIN_URL = "http://ope
// var MIRROR_MIRRORBRAIN_URL = "http://download.services.openoffice.org/";;
var MIRROR_SOURCEFORGE_URL =
"http://sourceforge.net/projects/openofficeorg.mirror/";;
var MIRROR_APACHE_URL =
"http://www.apache.org/dyn/closer.cgi/incubator/ooo/";;
+var MIRROR_APACHE_DIST_URL = "http://www.apache.org/dist/incubator/ooo/";;
// Don't add these on, they're alredy supplied by mirrobrarin_getLink,
reference only
var SOURCEFORGE_SUFFIX = "files/stable/3.4/";
var APACHE_SUFFIX = "files/stable/3.4/";
+var SOURCEFORGE_SUFFIX_STABLE = "files/stable/";
+var SOURCEFORGE_SUFFIX_LOC = "files/localized/";
+var APACHE_SUFFIX_STABLE = "files/stable/";
+var APACHE_SUFFIX_LOC = "files/localized/";
var MIRROR_SOURCEFORGE_REF = MIRROR_SOURCEFORGE_URL + SOURCEFORGE_SUFFIX;
var MIRROR_APACHE_REF = MIRROR_APACHE_URL + APACHE_SUFFIX;
