Changeset 7083

Timestamp:

11/26/08 01:44:04 (6 weeks ago)

Author:

daybreaker

Message:

refs #1131:

• 스크립트 실행시간 제한에 따라, 한 번에 캐시로 다 넣지 않고 요청이 들어올 때마다 일정 개수씩 넣도록 함
  

Location:

trunk/plugins/GoogleMap

Files:

• gmap_common.js (modified) (1 diff)
• index.php (modified) (3 diffs)

trunk/plugins/GoogleMap/gmap_common.js

@@ -78 +78 @@
 function GMap_findLocationCallback(response, gmap, location_info, title, link, boundary, locations) {
     if (!response || response.Status.code != 200) {
-        // alert('Can\'t retrieve this address "'+address+'"');
+        if (process_count != undefined)
+            process_count++;
     } else {
         var place = response.Placemark[0];

trunk/plugins/GoogleMap/index.php

@@ -137 +137 @@
             locationMap.enableContinuousZoom();
             locationMap.setCenter(new GLatLng(<?php echo $lat;?>, <?php echo $lng;?>), <?php echo $zoom;?>);
-            boundary = new GLatLngBounds(locationMap.getCenter()); //, new GLatLng(<?php echo $lat+0.1;?>, <?php echo $lng+0.1;?>));
+            boundary = new GLatLngBounds(locationMap.getCenter());
             var locations = new Array();
 <?php
     $count = 0;
+    $countRemoteQuery = 0;
     foreach ($locatives as $locative) {
         $locative['link'] = "$blogURL/" . ($blog['useSloganOnPost'] ? 'entry/' . URL::encode($locative['slogan'],$service['useEncodedURL']) : $locative['id']);
         $row = POD::queryRow("SELECT * FROM {$database['prefix']}GMapLocations WHERE blogid = ".getBlogId()." AND address = '".POD::escapeString($locative['location'])."'");
-        $found = false;
+        $result = 9; // 0 = found, 1 = find in client, 9 = not found
         if ($row == null || empty($row)) {
-            //echo "\t\t\t/* New location query */\n";
             // Recursively repeat until location is found. (continuously reducing accuracy)
             $addr = explode(' ', _GMap_normalizeAddress($locative['location']));
             while (true) {
+                if ($countRemoteQuery == 12) { // not to exceed script-running time limit
+                    $result = 1;
+                    break;
+                }
                 $url = "http://maps.google.co.kr/maps/geo?q=".urlencode(trim(implode(' ', $addr)))."&output=csv&sensor=false&key={$config['apiKey']}";
-                //echo "\t\t\t/* recurse : $addr */\n";
                 $response = requestHttp('get', $url, false, 'text/plain');
+                $countRemoteQuery++;
                 if ($response === false) {
-                    $found = false;
+                    $result = 9;
                     break;
                 } else {
@@ -161 +165 @@
                     if ($response_csv[0] == '200') {
                         // Insert for later use.
-                        //echo "\t\t\t/* read from api, {$locative['location']} */\n";
                         $lat = $response_csv[2];
                         $lng = $response_csv[3];
                         POD::execute("INSERT INTO {$database['prefix']}GMapLocations VALUES (".getBlogId().", '".POD::escapeString($locative['location'])."', $lng, $lat, NOW())");
-                        $found = true;
+                        $result = 0;
                         break;
                     } else {
-                        //echo "\t\t\t/* can't retrieve result for {$locative['location']} */\n";
                         $lat = null; $lng = null;
-                        $found = false;
+                        $result = 9;
                         if (count($addr) == 1)
                             break;
-                        if (!$found)
+                        if ($result == 9)
                             array_pop($addr);
                         continue;
@@ -179 +181 @@
                 }
             }
-            if (!$found) {
-                // Not found.
-                //echo "\t\t\t/* no result for {$locative['location']} */\n";
+            if ($result == 9) {
+                // Not found. Don't try also later.
                 POD::execute("INSERT INTO {$database['prefix']}GMapLocations VALUES (".getBlogId().", '".POD::escapeString($locative['location'])."', NULL, NULL, NOW())");
             }
         } else {
-            //echo "\t\t\t/* read from db : {$locative['location']} */\n";
             $lat = $row['latitude'];
             $lng = $row['longitude'];
-            $found = true;
-        }
-        if ($found && !is_null($lat)) {
+            $result = 0;
+        }
+        switch ($result) {
+        case 0: // found
             echo "\t\t\tGMap_addLocationMarkDirect(locationMap, {address:GMap_normalizeAddress('{$locative['location']}'), path:'{$locative['location']}'}, '".str_replace("'", "\\'", $locative['title'])."', encodeURI('".str_replace("'", "\\'", $locative['link'])."'), new GLatLng($lat, $lng), boundary, locations);\n";
-        } else
+            break;
+        case 1: // find in client
+            echo "\t\t\tGMap_addLocationMark(locationMap, {address:GMap_normalizeAddress('{$locative['location']}'), path:'{$locative['location']}'}, '".str_replace("'", "\\'", $locative['title'])."', encodeURI('".str_replace("'", "\\'", $locative['link'])."'), boundary, locations);\n";
+            break;
+        case 9:
             echo "\t\t\tif (process_count != undefined) process_count++;\n";
+        }
         $count++;
     }
 ?>
-            //window.setTimeout('locationFetchPoller(<?php echo $count;?>);', polling_interval);
-            adjustToBoundary();
+            window.setTimeout('locationFetchPoller(<?php echo $count;?>);', polling_interval);
+            //adjustToBoundary();
         } else {
             c.innerHTML = '<p style="text-align:center; color:#c99;">이 웹브라우저는 구글맵과 호환되지 않습니다.</p>';