Author: buildbot
Date: Fri May 18 20:44:01 2012
New Revision: 818223

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/download_new_mirrorbrain_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 20:44:01 2012
@@ -1 +1 @@
-1340208
+1340242

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 18 20:44:01 2012
@@ -1 +1 @@
-1340208
+1340242

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 20:44:01 2012
@@ -8,10 +8,12 @@ function getMirrorHost() {
        var randVal      = ( Math.random() * 100 );
        var MIRROR_RATIO = MIRROR_RATIO_1;
 
-       /*document.write( "ASF is active: " + MIRROR_ASF_ACTIVE + "<br/>" );
+       /*
+       document.write( "ASF is active: " + MIRROR_ASF_ACTIVE + "<br/>" );
        document.write( "SF is active: "  + MIRROR_SF_ACTIVE  + "<br/>" );
        document.write( "Mirror ratio: "  + MIRROR_RATIO      + " % <br/>" );
-       document.write( "Random value: "  + randVal           + "<br/><br/>" 
);*/
+       document.write( "Random value: "  + randVal           + "<br/><br/>" );
+       */
 
        // Are Apache mirrors working?
        if ( MIRROR_ASF_ACTIVE > 0 ) {
@@ -63,11 +65,13 @@ function getMirrorHost_asf_sf_mb_percent
        var randVal      = ( Math.random() * 100 );
        var MIRROR_RATIO = MIRROR_RATIO_2;
 
-       /*document.write( "ASF is active: " + MIRROR_ASF_ACTIVE + "<br/>" );
+       /*
+       document.write( "ASF is active: " + MIRROR_ASF_ACTIVE + "<br/>" );
        document.write( "SF is active: "  + MIRROR_SF_ACTIVE  + "<br/>" );
        document.write( "MB is active: "  + MIRROR_MB_ACTIVE  + "<br/>" );
        document.write( "Mirror ratio: "  + MIRROR_RATIO      + " % <br/>" );
-       document.write( "Random value: "  + randVal           + "<br/><br/>" 
);*/
+       document.write( "Random value: "  + randVal           + "<br/><br/>" );
+       */
 
        // Are Apache mirrors working?
        if ( MIRROR_ASF_ACTIVE > 0 ) {
@@ -132,7 +136,8 @@ function getMirrorHost_asf_sf_mb_weighte
        // Assign the random position of the weighted array
        var mirrorHost = MIRROR_HOSTS_WEIGHTED [ randVal ];
 
-       /*document.write( "ASF is active: " + MIRROR_ASF_ACTIVE        + 
"<br/>" );
+       /*
+       document.write( "ASF is active: " + MIRROR_ASF_ACTIVE        + "<br/>" 
);
        document.write( "MB is active: "  + MIRROR_MB_ACTIVE         + "<br/>" 
);
        document.write( "SF is active: "  + MIRROR_SF_ACTIVE         + "<br/>" 
);
        document.write( "ASF weight: "    + MIRROR_HOSTS_WEIGHT[ 0 ] + "<br/>" 
);
@@ -188,7 +193,8 @@ function getMirrorHost_asf_sf_mb_weighte
        var mirrorHost = "";
        var weight     = MIRROR_ASF_WEIGHT + MIRROR_MB_WEIGHT + 
MIRROR_SF_WEIGHT;
        var randVal    = Math.random();
-/*
+
+       /*
        document.write( "ASF is active: "  + MIRROR_ASF_ACTIVE              + 
"<br/>" );
        document.write( "MB is active: "   + MIRROR_MB_ACTIVE               + 
"<br/>" );
        document.write( "SF is active: "   + MIRROR_SF_ACTIVE               + 
"<br/>" );
@@ -326,13 +332,6 @@ function getLanguage( nl_language ) {
 }
 
 /*
- * set language in order to avoid navigator language detection
- */
-function setLanguage( language ) {
-       NL_LANGUAGE = language;
-}
-
-/*
  * get language for user-language in ISO format
  */
 function getLanguageISO( nl_language ) {
@@ -394,12 +393,11 @@ function getLanguageISO( nl_language ) {
  */
 function hasMirrorLink( nl_language ) {
        var a = getArray( nl_language );
-       var platform = getPlatform();
-       var schema = SCHEMA;
+       var platform = getPlatform( SCHEMA );
 
        // alert ("schema: -" + schema +"-");
-       if ( schema == "aoo" ) {
-               platform = getPlatform( schema );
+       if ( SCHEMA == "aoo" ) {
+               platform = getPlatform( SCHEMA );
        }
        
        // alert ("Platform: -" + platform +"-");
@@ -430,7 +428,7 @@ function getLink( version, nl_language, 
                        return mirrorbrain_getLink( version, nl_language, 
schema );
                } else if ( mirror.indexOf( "sourceforge" ) > -1 ) {
                        return sourceforge_getLink( version, nl_language, 
schema );
-               } else if ( mirror.indexOf( "apache")  > -1) {
+               } else if ( mirror.indexOf( "apache" )  > -1) {
                        return apache_getLink ( version, nl_language, schema );
                } else {
                        return mirrorbrain_getLink( version, nl_language, 
schema );
@@ -439,16 +437,6 @@ function getLink( version, nl_language, 
        }
 }
 
-/*
- * get link setting link language instead of letting the script detect it
- * depends on getLink( version, mirror, schema ) and setLanguage( lang )
- */
-function getLinkWithLang( version, nl_language, mirror, schema ) {
-       setLanguage( nl_language );
-       return getLink( version, nl_language, mirror, schema );
-}
-
-
 /* getLink mods for new mirrors */
 
 function sourceforge_getLink( version, nl_language, schema ) {
@@ -462,77 +450,11 @@ function apache_getLink( version, nl_lan
        var apache_link = mirrorbrain_link.replace( MIRROR_MIRRORBRAIN_URL, 
MIRROR_APACHE_REF ) ;
        return apache_link;
 }
+
 /*
  * get platform of browser
- * independant from mirror-system
+ * depending from mirror-system (represented by the schema)
  */
-function getPlatform() {
-       if ( navigator.platform != null &&  String(navigator.platform) != "" ) {
-               if ( navigator.platform.indexOf( "Win32" ) != -1 ) {
-                       return "Windows";
-               } else if ( navigator.platform.indexOf( "Win64" ) != -1 ) {
-                       return "Windows";
-               } else if ( navigator.platform.indexOf( "Win" ) != -1 ) {
-                       return "Windows";
-               } else if ( navigator.platform.indexOf( "Linux" ) != -1 ) {
-                       if ( navigator.platform.indexOf( "64" ) != -1 ) {
-                               if ( navigator.userAgent != null ) {
-                                       if ( 
navigator.userAgent.toLowerCase().indexOf( "debian" ) != -1 ||
-                                            
navigator.userAgent.toLowerCase().indexOf( "ubuntu" ) != -1 ||
-                                            
navigator.userAgent.toLowerCase().indexOf( "iceweasel" ) != -1 ) {
-                                               return "Linux Debian 64-bit 
(DEB)";
-                                       } else {
-                                               return "Linux 64-bit (RPM)";
-                                       }
-                               } else {
-                                       return "Linux 64-bit (RPM)";
-                               }
-                       } else {
-                               if ( navigator.userAgent != null ) {
-                                       if ( 
navigator.userAgent.toLowerCase().indexOf( "debian" ) != -1 ||
-                                            
navigator.userAgent.toLowerCase().indexOf( "ubuntu" ) != -1 ||
-                                            
navigator.userAgent.toLowerCase().indexOf( "iceweasel" ) != -1 ) {
-                                               return "Linux Debian 32-Bit 
(DEB)";
-                                       } else {
-                                               return "Linux 32-Bit (RPM)";
-                                       }
-                               } else {
-                                       return "Linux 32-Bit (RPM)";
-                               }
-                       }
-               } else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) 
{
-                       return "Solaris x86";
-               } else if ( navigator.platform.indexOf( "SunOS sun4u" ) != -1 ) 
{
-                       return "Solaris SPARC";
-               } else if ( navigator.platform.indexOf( "SunOS" ) != -1 ) {
-                       return "Solaris SPARC";
-               } else if ( navigator.platform.indexOf( "Mac" ) != -1 &&
-                           navigator.platform.indexOf( "Intel" ) != -1 ) {
-                       return "Mac OS Intel";
-               } else if ( navigator.platform.indexOf( "Mac" ) != -1 &&
-                           navigator.platform.indexOf( "PPC" ) != -1 ) {
-                       return "Mac OS PPC";
-               } else if ( navigator.platform.indexOf( "Mac" ) != -1 ) {
-                       return "Mac OS Intel" ;
-               } else if ( navigator.platform.indexOf( "iPad" ) != -1 ||
-                           navigator.platform.indexOf( "iPhone" ) != -1 ||
-                           navigator.platform.indexOf( "iPod" ) != -1 ) {
-                       // this code will redirect the iPad, iPhone and iPod 
entries
-                       return "Mac OS Intel" ;
-               } else if ( navigator.platform.indexOf( "Series60" ) != -1 ) {
-                       // this code will redirect the Series60 entries
-                       return "Windows" ;
-               } else if ( navigator.platform.indexOf( "null" ) != -1 ) {
-                       return "Windows" ;
-               } else {
-                       // return platform name
-                       return "no_platform";
-               }
-       }
-       return "Windows";
-}
-
-/* for customizing platforms for various schemas/release */
 function getPlatform( schema ) {
        if ( schema == "aoo" ) {
                if ( navigator.platform != null &&  String( navigator.platform 
) != "" ) {
@@ -594,7 +516,7 @@ function getPlatform( schema ) {
                                return "Windows" ;
                        } else {
                                // return platform name
-                               return "no_platoform";
+                               return "no_platform";
                        }
                }
        }
@@ -603,101 +525,11 @@ function getPlatform( schema ) {
        return "no_platform";
 }
 
-/*
- * get platform for bouncer-link
- * must be changed
- */
-function getPlatformForMirror() {
-       return bouncer_getPlatformForMirror();
-}
-
-/*
- * deprecated
- * must be changed
- */
-function getPlatformForBouncer() {
-       return getPlatformForMirror();
-}
-
-/*
- * get tupel for tracking
- */
-function getTupel( href ) {
-    if ( href.indexOf( "?" ) > 0 && href.indexOf( MIRROR_BOUNCER_URL ) > -1 ) {
-               return bouncer_getTupel( href );
-       } else if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               return mirrorbrain_getTupel( href );
-       }
-       return "";
-}
-
-/*
- * get product name for tracking
- */
-function getProduct( href ) {
-       var retVal = "";
-
-       if ( href.indexOf( "?" ) > 0 && href.indexOf( MIRROR_BOUNCER_URL ) > -1 
) {
-               return bouncer_getProduct( href );
-       } else if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               return mirrorbrain_getProduct( href );
-       }
-       return retVal;
-}
-
-/*
- * get language code for tracking
- */
-function getLang( href ) {
-       var retVal = "";
-
-       if ( href.indexOf( "?" ) > 0 && href.indexOf( MIRROR_BOUNCER_URL ) > -1 
) {
-               return bouncer_getLang( href );
-       } else if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               return mirrorbrain_getLang( href );
-       }
-       return retVal;
-}
-
-/*
- * get os for tracking
- */
-function getOS( href ) {
-       var retVal = "";
-
-       if ( href.indexOf( "?" ) > 0 && href.indexOf( MIRROR_BOUNCER_URL ) > -1 
) {
-               return bouncer_getOS( href );
-       } else if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               return mirrorbrain_getOS( href );
-       }
-       return retVal;
-}
-
-/*
- * get version for tracking
- */
-function getVersion( href ) {
-       var retVal = "";
-
-       if ( href.indexOf( "?" ) > 0 && href.indexOf( MIRROR_BOUNCER_URL ) > -1 
) {
-               return bouncer_getVersion( href );
-       } else if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               return mirrorbrain_getVersion( href );
-       }
-       return retVal;
-}
-
 function continueToDownload( uri ) {
-       uri = uri.replace( MIRROR_BOUNCER_URL, "" );
        document.location = "http://download.openoffice.org/contribute.html"; + 
uri;
        //absolute to for use at other subdomains
 }
 
-function continueToDownloadTwo( uri ) {
-       uri = uri.replace("http://openoffice.bouncer.osuosl.org/","";);
-       document.location = "http://download.openoffice.org/contribute.html"; + 
uri;
-}
-
 function openItem( itemid, uri ) {
        var thisDocument = document.getElementById("downloadextendedtext");
        var thisDocument = document.getElementById(itemid);
@@ -707,54 +539,16 @@ function openItem( itemid, uri ) {
               itemid=="optionitem6" ||
               itemid=="optionitem7" ||
               itemid=="optionitem8" ) &&
-              uri.indexOf( MIRROR_BOUNCER_URL ) > -1 ) {
 
-               uri = uri.replace( MIRROR_BOUNCER_URL + "?","");
-               uri = 
"http://download.openoffice.org/contribute.html?download=bouncer&"; + escape( 
uri );
-       } else if ( ( itemid=="optionitem1" ||
-                     itemid=="optionitem5" ||
-                     itemid=="optionitem6" ||
-                     itemid=="optionitem7" ||
-                     itemid=="optionitem8" ) &&
-                     uri.indexOf( MIRROR_MIRRORBRAIN_URL ) > -1 ) {
+               uri.indexOf( MIRROR_MIRRORBRAIN_URL ) > -1 ) {
 
                uri = uri.replace( MIRROR_MIRRORBRAIN_URL, "");
                uri = 
"http://download.openoffice.org/contribute.html?download=mirrorbrain&"; + 
escape( uri );
        }
        document.location = uri;
-       // start( uri );
+       // alert( 'Go to OpenOffice.org ' + uri );
 };
 
-function makeDownloadLIintoButtons() {
-       var downloadextendedtext = document.getElementById( 
"downloadextendedtext" );
-       var liItems = downloadextendedtext.getElementsByTagName("li");
-
-       for (var i = 0; i < liItems.length; i++) {
-               var liItemsAnchors = liItems[i].getElementsByTagName("a");
-               if (liItemsAnchors.length == 1) {
-                       var hrefcontents = liItemsAnchors[0].href;
-                       if (hrefcontents.search( "bouncer" ) > -1 || 
hrefcontents.search( MIRROR_MIRRORBRAIN_URL ) > -1) {
-                               liItems[i].onclick = function () {
-                                       var myHref = 
this.getElementsByTagName("a")[0].href;
-                                       continueToDownload(myHref);
-                                       return false;
-                               };
-                       } else {
-                               liItems[i].onclick = function () {
-                                       var myHref = 
this.getElementsByTagName("a")[0].href;
-                                       document.location = myHref;
-                                       return false;
-                               };
-                       }
-                       liItems[i].style.cursor = "pointer";
-               }
-       }
-}
-
-function start( uri ) {
-       alert( 'Go to OpenOffice.org ' + uri );
-
-}
 function doLoad( uri ) {
        // the timeout value should be the same as in the "refresh" meta-tag
        setTimeout( "download('" + uri + "')", 2*1000 );
@@ -769,29 +563,16 @@ function startDownload() {
        var s = window.location.search;
        i = s.indexOf( "download=" );
        if ( i > -1 ) {
-               if ( s.indexOf( "download=bouncer" ) > -1 ) {
-                       uri = unescape( s.split( "download=bouncer" )[1] );
-                       uri = MIRROR_BOUNCER_URL + "?" + uri;
-               } else if ( s.indexOf( "download=mirrorbrain&" ) > -1 ) {
-                       uri = unescape( s.split( "download=mirrorbrain&" )[1] );
+               if ( s.indexOf( "download=mirrorbrain&" ) > -1 ) {
+                       uri = unescape( s.split( "download=mirrorbrain&" )[ 1 ] 
);
                        uri = MIRROR_MIRRORBRAIN_URL + uri;
                }
-               s_linkType = "d";
-               s_linkTrackVars = 
"events,products,eVar3,eVar8,prop19,prop20,prop21";
-               s_linkTrackEvents = "event7";
-               s_events = "event7";
-               s_eVar3 = "ooo";
-               s_linkName = "ooo:" + getTupel( uri );
-               s_products = "Downloaded Products;" + getProduct( uri ) + " 
Download";
-               s_eVar8 = getTupel( uri );
-               s_prop19 = getOS( uri );
-               s_prop20 = getLang( uri );
-               s_prop21 = getVersion( uri );
                if ( uri != null ) {
-                       document.write( "Starting download from <a 
onClick='s_lnk=s_co(this);s_gs(s_account);' href='" + uri + "'>" + uri + 
"</a>." );
+                       document.write( "Starting download from <a href='" + 
uri + "'>" + uri + "</a>." );
                        doLoad( uri );
                }
                // document.location = uri;
                return false;
        }
 }
+

Modified: 
websites/staging/ooo-site/trunk/content/download/download_new_mirrorbrain_aoo.js
==============================================================================
--- 
websites/staging/ooo-site/trunk/content/download/download_new_mirrorbrain_aoo.js
 (original)
+++ 
websites/staging/ooo-site/trunk/content/download/download_new_mirrorbrain_aoo.js
 Fri May 18 20:44:01 2012
@@ -4,7 +4,7 @@
  */
 function mirrorbrain_getLink( version, nl_language, schema ) {
        var a = getArray( nl_language );
-       var platform = getPlatform();
+       var platform = getPlatform( schema );
        var link = null;
        var language = nl_language;
 
@@ -75,195 +75,7 @@ function mirrorbrain_getLink( version, n
 }
 
 /*
- * special tupel for tracking
- */
-function mirrorbrain_getTupel( href ) {
-       var retVal = "";
-       var file;
-       file = mirrorbrain_getTagFileName( href );
-    if ( file != null ) {
-               var product, os, lang, version;
-               product = mirrorbrain_getTagProduct( file );
-               version = mirrorbrain_getTagVersion( file );
-               os = mirrorbrain_getTagOS( file );
-               lang = mirrorbrain_getTagLang( file );
-               retVal = product + " " + version + "-" + os + "-" + lang + "-" 
+ version;
-    }
-    return retVal;
-}
-
-/*
- * extract file name from url
- */
-function mirrorbrain_getTagFileName( href ) {
-       var retVal;
-    if ( href.indexOf( MIRROR_MIRRORBRAIN_URL + "files/" ) > -1 ) {
-               var s = href.split( "/" );
-               retVal = s[s.length-1];
-    }
-    return retVal;
-}
-
-/*
- * get product name for tracking, external used method
- */
-function mirrorbrain_getProduct( href ) {
-       var file;
-       file = mirrorbrain_getTagFileName( href );
-       return mirrorbrain_getTagProduct( file ) + " " + 
mirrorbrain_getTagVersion( file );
-}
-
-/*
- * get version for tracking, external used method
- */
-function mirrorbrain_getVersion( href ) {
-       var file;
-       file = mirrorbrain_getTagFileName( href );
-       return mirrorbrain_getTagVersion( file );
-}
-
-/*
- * get os for tracking, external used method
- */
-function mirrorbrain_getOS( href ) {
-       var file;
-       file = mirrorbrain_getTagFileName( href );
-       return mirrorbrain_getTagOS( file );
-}
-
-/*
- * get language code for tracking, external used method
- */
-function mirrorbrain_getLang( href ) {
-       var file;
-       file = mirrorbrain_getTagFileName( href );
-       return mirrorbrain_getTagLang( file );
-}
-
-/*
- * get language code for tracking, internal method
- */
-function mirrorbrain_getTagLang( file ) {
-       var retVal;
-       if ( file != null &&
-            ( file.indexOf( "_install-" ) > -1 ||
-            ( file.indexOf( "_install_" ) > -1 &&
-            ( file.indexOf( "_Linux_" ) > -1 ||
-              file.indexOf( "_MacOS_" ) > -1 ||
-              file.indexOf( "_Win_" ) > -1 ||
-              file.indexOf( "_Solaris_" ) > -1 ) ) ) ) {
-
-               var s = file.split( "_install" );
-               s = s[1].split( "." );
-               s = s[0].split( "_" );
-               retVal = s[s.length-1];
-
-       } else if ( file != null && file.indexOf( "_install_" ) > -1 ) {
-               var s = file.split( "_install_" );
-               s = s[1].split( "." );
-               s = s[0].split( "_" );
-               if ( s[s.length-1].indexOf( "deb" ) > -1 ) {
-                       retVal = s[s.length-2];
-               } else {
-                       retVal = s[s.length-1];
-               }
-       }
-       return retVal;
-}
-
-/*
- * get os name for tracking, internal method
- */
-function mirrorbrain_getTagOS( file ) {
-       var retVal;
-       if ( file != null && (
-            file.indexOf( "_install-" ) > -1 ||
-            ( file.indexOf( "_install_" ) > -1 &&
-            ( file.indexOf( "_Linux_" ) > -1 ||
-              file.indexOf( "_MacOS_" ) > -1 ||
-              file.indexOf( "_Win_" ) > -1 ||
-              file.indexOf( "_Solaris_" ) > -1 ) ) ) ) {
-
-               var s = file.split( "_install" );
-               s = s[0].split( "_" );
-               retVal = s[ s.length -2 ] + s[ s.length -1 ];
-               retVal = retVal.toLowerCase();
-               if ( retVal.indexOf( "winx86" ) > -1 ) {
-                       retVal = "win";
-               } else if ( retVal == "linuxx86" ) {
-                       retVal = "linuxintel";
-               } else if ( retVal == "macosx86" ) {
-                       retVal = "macosxintel";
-               } else if ( retVal == "macosppc" ) {
-                       retVal = "macosxppc";
-               }
-               if ( file.indexOf( "install-deb" ) > -1 ) {
-                       retVal = retVal + "deb";
-               }
-       } else if ( file != null && file.indexOf( "_install_" ) > -1 ) {
-               var s = file.split( "_install_" );
-               s = s[0].split( "_" );
-               retVal = s[ s.length -1 ];
-               retVal = retVal.toLowerCase();
-               if ( retVal.indexOf( "win32intel" ) > -1 ) {
-                       retVal = "win";
-               }
-               if ( file.indexOf( "_deb" ) > -1 ) {
-                       retVal = retVal + "deb";
-               } else if ( file.indexOf( "install-deb" ) > -1 ) {
-                       retVal = retVal + "deb";
-               }
-       }
-       return retVal;
-}
-
-/*
- * get product name for tracking, internal method
- */
-function mirrorbrain_getTagProduct( file ) {
-       var retVal = null;
-       if ( file != null ) {
-               var s = file.split( "_" );
-               retVal = s[0];
-       }
-       return retVal;
-}
-
-/*
- * get version for tracking, internal method
- */
-function mirrorbrain_getTagVersion( file ) {
-       var retVal = null;
-       if ( file != null ) {
-               var s = file.split( "_" );
-               retVal = s[1];
-               if ( s[0] == "OOo-Dev" ) {
-                       if ( file.indexOf( "_install-" ) > -1 ||
-                          ( file.indexOf( "_install_" ) > -1 &&
-                          ( file.indexOf( "_Linux_" ) > -1 ||
-                            file.indexOf( "_MacOS_" ) > -1 ||
-                            file.indexOf( "_Win_" ) > -1 ||
-                            file.indexOf( "_Solaris_" ) > -1 ) ) ) {
-                               // new schema
-                               if ( s[1].indexOf( "_m" ) > -1 ) {
-                                       retVal = s[1];
-                               } else if ( s[1].indexOf( "m" ) > -1 ) {
-                                       var s2 = s[1].split( "m" );
-                                       retVal = s2[0] + "_m" + s2[1];
-                               } else {
-                                       retVal = s[1];
-                               }
-                       } else {
-                               // old schema
-                               retVal = s[1] + "_" + s[2];
-                       }
-               }
-       }
-       return retVal;
-}
-
-/*
- * method trim timestamp from version, required for RC, requested by MLA
+ * method trim timestamp from version, required for RC
  */
 function mirrorbrain_getVersionForDownloadFolder( version ) {
        var s = null;
@@ -294,7 +106,7 @@ function mirrorbrain_getVersionForDownlo
 
 function mirrorbrain_getFileName( version, nl_language, schema ) {
        var a = getArray( nl_language );
-       var platform = getPlatform();
+       var platform = getPlatform( schema );
        var fileName = null;
        var language = nl_language;
 

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 20:44:01 2012
@@ -9,8 +9,9 @@
    Correct: "We are proud to announce the availability of our new
              OpenOffice.org " + VERSION + " release."
 
-   MIRROR:  set default mirror site
-   SCHEMA:  reflects the download-set naming-schema with "old" or "new"
+   VERSION: set the current release version, e.g., "3.4.0"
+   MIRROR:  set default mirror site with "sourceforge", "apache" or 
"mirrorbrain"
+   SCHEMA:  reflects the download-set naming-schema with "ooo" or "aoo"
 */
 
 // The supported mirror hosts, 0 means not ready to receive load
@@ -25,7 +26,7 @@ var MIRROR_HOSTS_WEIGHT               = [ 1, 2, 3 ];
 var MIRROR_HOSTS_WEIGHTED      = [ "Apache", "MirrorBrain", "MirrorBrain", 
"SourceForge", "SourceForge", "SourceForge" ];
 
 // Exchange the variables resp. its content to switch the MirrorBrain server
-var MIRROR_BOUNCER_URL         = "http://openoffice.bouncer.osuosl.org/";;
+// var MIRROR_BOUNCER_URL              = 
"http://openoffice.bouncer.osuosl.org/";;
 var MIRROR_MIRRORBRAIN_URL     = "http://openoffice.mirrorbrain.org/";;
 // var MIRROR_MIRRORBRAIN_URL  = "http://download.services.openoffice.org/";;
 var MIRROR_SOURCEFORGE_URL     = 
"http://sourceforge.net/projects/openofficeorg.mirror/";;
@@ -47,8 +48,7 @@ var MIRROR_STABLE_URL         = MIRROR_SOURCEFO
 
 //The most recent stable release
 var VERSION                    = "3.4.0";
-//var MIRROR                   = "sourceforge";
-var MIRROR                     = MIRROR_SOURCEFORGE_URL;
+var MIRROR                     = "sourceforge";
 var SCHEMA                     = "aoo";
 
 //The maximal available number of languages


Reply via email to