Changeset 2166

Timestamp:

11/25/10 21:09:57 (18 months ago)

Author:

paparazzia

Message:

allow use of master tiles server (see #31)
useful if you can't get the tiles_g binary to work on your server ;)

Location:

trunk

Files:

• base/scripts/upgrade-v0.15.sql (modified) (1 diff)
• hosting/conf/param.php.dist (modified) (1 diff)
• site/cache.php (modified) (1 diff)
• site/gshhstiles.php (modified) (2 diffs)

trunk/base/scripts/upgrade-v0.15.sql

@@ -28 +28 @@
 #On mets à standard tous les _boats_ admins
 UPDATE users SET class = 'standard' WHERE class = 'admin';
+
+#Meilleure indexation de races
+ALTER TABLE `races` ADD INDEX filter (started, deptime, closetime);

trunk/hosting/conf/param.php.dist

@@ -42 +42 @@
 //define("MAIL_PREFIX", "VLM_".SERVER_NAME);
 
-
+//TILES PREFS - DEFINE ONLY IF YOUR VLM INSTANCE HAS NOT PROPER TILES_G BINARY
+//define("TILES_SOURCE_SERVER", "http://testing.virtual-loup-de-mer.org");
 
 ?>

trunk/site/cache.php

@@ -2 +2 @@
     function headeranddie($h) {
         header("Cache-Control: no-cache"); // no cache for dummy answer
-//        header("Status: 302 Moved Temporarily", false, 302);
+        header("Status: 302 Moved Temporarily", false, 302);
         header("Location: $h");
         exit();

trunk/site/gshhstiles.php

@@ -7 +7 @@
     $force = get_cgi_var('force', 'no');
 
-    if ( $tilez < 0 && $tilez > 20 ) die("bad z index");
+    if ( $tilez < 0 && $tilez > 20 ) die("Bad z index");
     $sizetile = pow(2, $tilez);
     $tilex = $tilex % $sizetile;
@@ -20 +20 @@
     if ( ( ! file_exists($original) ) ||  ($force == 'yes') ) {
         if (!is_dir($originaldir)) mkdir($originaldir, 0777, True);
-        $execcmd = sprintf("%s %d %d %d %s %s", TILES_G_PATH, pow(2, $tilez), $tilex, $tiley, GSHHS_CLIPPED_FILENAME, $original);
-        shell_exec($execcmd);
+        if (defined("TILES_SOURCE_SERVER")) {
+            copy(sprintf("%s/%s", TILES_SOURCE_SERVER, $original), $original);
+        } else {
+            $execcmd = sprintf("%s %d %d %d %s %s", TILES_G_PATH, pow(2, $tilez), $tilex, $tiley, GSHHS_CLIPPED_FILENAME, $original);
+            shell_exec($execcmd);
+        }
     }
     header("Content-Type: image/png");