Merge pull request #67 from Indicia-Team/hotfix-report_performance

Hotfix report performance
Indicia-Team · Dec 9, 2015 · 78a5207 · 78a5207
2 parents 6330df2 + 43e9af5
commit 78a5207
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/libraries/ReportEngine.php b/application/libraries/ReportEngine.php
@@ -986,14 +986,14 @@ private function getSysFuncFieldName($entity, $sysfunc, $dataType, $forceVarchar
     $suffix = $forceVarchar ? '::varchar' : '';
     switch ($dataType) {
       case 'F':
-        return "{$entity}_$sysfunc.float_value$forceVarchar\n";
+        return "{$entity}_$sysfunc.float_value$suffix\n";
         break;
       case 'T':
         return "{$entity}_$sysfunc.text_value\n";
         break;
       case 'D':
       case 'V':
-        return "{$entity}_$sysfunc.date_start_value$forceVarchar\n";
+        return "{$entity}_$sysfunc.date_start_value$suffix\n";
         break;
       case 'L':
         return "t{$entity}_$sysfunc.term\n";

diff --git a/modules/spatial_index_builder/plugins/spatial_index_builder.php b/modules/spatial_index_builder/plugins/spatial_index_builder.php
@@ -125,8 +125,8 @@ function spatial_index_builder_populate($db) {
   $filter=spatial_index_builder_get_type_filter();
   list($join, $where, $surveyRestriction)=$filter;
   // Now the actual population
-  $query = "insert into index_locations_samples (location_id, sample_id, contains)
-    select l.id, s.id, st_contains(l.boundary_geom, s.geom)
+  $query = "insert into index_locations_samples (location_id, sample_id, contains, location_type_id)
+    select l.id, s.id, st_contains(l.boundary_geom, s.geom), l.location_type_id
     from locations l
     $join
     join samples s on s.deleted=false