Merge branch 'hotfix-kml'

Indicia-Team · Sep 2, 2024 · df5638d · df5638d
2 parents 1190789 + bc97f8a
commit df5638d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -29,14 +29,14 @@
  *
  * @var string
  */
-$config['version'] = '9.3.2';
+$config['version'] = '9.3.3';
 
 /**
  * Version release date.
  *
  * @var string
  */
-$config['release_date'] = '2024-08-29';
+$config['release_date'] = '2024-09-02';
 
 /**
  * Link to the code repository downloads page.

diff --git a/modules/indicia_svc_data/controllers/data_service_base.php b/modules/indicia_svc_data/controllers/data_service_base.php
@@ -158,7 +158,6 @@ protected function handle_request() {
       case 'kml':
         // Keyhole Markup Language.
         $this->kml_encode($records);
-        $this->content_type = 'Content-Type: application/vnd.google-earth.kml+xml';
         break;
 
       case 'dwca':
@@ -250,6 +249,10 @@ private function setHeaders($mode) {
 
       case 'tsv':
         header('Content-Type: text/tab-separated-values');
+        break;
+
+      case 'kml':
+        header('Content-Type: application/vnd.google-earth.kml+xml');
     }
     if ($mode === 'csv') {
       // Prepend a byte order marker, so Excel recognises the CSV file as
@@ -746,6 +749,10 @@ protected function kml_encode($array) {
         }
         echo $this->kml_encode_array($recordNum, $root, $recordArray, 2) . "\r\n";
         $recordNum++;
+        // Output the buffer every 100 records.
+        if ($recordNum % 100 === 0) {
+          ob_flush();
+        }
       }
     }
     echo "  </Document>\n</kml>";

diff --git a/modules/rest_api/libraries/RestApiElasticsearch.php b/modules/rest_api/libraries/RestApiElasticsearch.php
@@ -2298,7 +2298,6 @@ private function proxyToEs($url, $requestBody, $format, $ret, $requestIsRawStrin
     $response = curl_exec($session);
     $headers = curl_getinfo($session);
     $httpCode = curl_getinfo($session, CURLINFO_HTTP_CODE);
-    kohana::log('error', 'Query: ' . $postData);
     if ($httpCode !== 200) {
       $error = curl_error($session);
       kohana::log('error', 'ES proxy request failed: ' . $error . ': ' . json_encode($error));