Peter M. Groen / knowledgetree

Commit d72a849c01193f44fcfaec80cae54615323ffa59

Authored by Conrad Vermeulen
1 parent 31c656cb

KTS-3802 

"Add search/maxSqlResults to config settings"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9501 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 15 additions and 3 deletions
search2/search/expr.inc.php
  View file @d72a849
@@ -1369,6 +1369,11 @@ class SQLQueryBuilder implements QueryBuilder @@ -1369,6 +1369,11 @@ class SQLQueryBuilder implements QueryBuilder
1369 $expr = $this->buildCoreSQLExpr($expr); 1369 $expr = $this->buildCoreSQLExpr($expr);
1370 $sql .= $expr; 1370 $sql .= $expr;
1371 1371
  1372 + $config = KTConfig::getSingleton();
  1373 + $maxSqlResults = $config->get('search/maxSqlResults', 1000);
  1374 +
  1375 + $sql .= "limit $maxSqlResults";
  1376 +
1372 return $sql; 1377 return $sql;
1373 } 1378 }
1374 1379
@@ -1425,6 +1430,11 @@ class SQLQueryBuilder implements QueryBuilder @@ -1425,6 +1430,11 @@ class SQLQueryBuilder implements QueryBuilder
1425 } 1430 }
1426 } 1431 }
1427 1432
  1433 + $config = KTConfig::getSingleton();
  1434 + $maxSqlResults = $config->get('search/maxSqlResults', 1000);
  1435 +
  1436 + $sql .= "limit $maxSqlResults";
  1437 +
1428 return $sql; 1438 return $sql;
1429 } 1439 }
1430 1440
sql/mysql/install/data.sql
  View file @d72a849
@@ -275,7 +275,8 @@ INSERT INTO `config_settings` VALUES @@ -275,7 +275,8 @@ INSERT INTO `config_settings` VALUES
275 (101, 'session', 'Enable version check', 'Compares the system version with the database version to determine if a database upgrade is needed.','dbversioncompare', 'default', 'true', 'boolean', NULL, 0), 275 (101, 'session', 'Enable version check', 'Compares the system version with the database version to determine if a database upgrade is needed.','dbversioncompare', 'default', 'true', 'boolean', NULL, 0),
276 (102, 'tweaks', 'Update Document Version (Content) on Editing Metadata', 'The document version is equivalent to the document content version. When set to true the document version will be increased when the document metadata is updated.', 'updateContentVersion', 'default', 'false', 'boolean', NULL, 1), 276 (102, 'tweaks', 'Update Document Version (Content) on Editing Metadata', 'The document version is equivalent to the document content version. When set to true the document version will be increased when the document metadata is updated.', 'updateContentVersion', 'default', 'false', 'boolean', NULL, 1),
277 (103, 'tweaks', 'Always Force Original Filename on Checkin', 'When set to true, the checkbox for "Force Original Filename" will be hidden on check-in. This ensures that the filename will always stay the same.', 'disableForceFilenameOption', 'default', 'false', 'boolean', NULL, 1), 277 (103, 'tweaks', 'Always Force Original Filename on Checkin', 'When set to true, the checkbox for "Force Original Filename" will be hidden on check-in. This ensures that the filename will always stay the same.', 'disableForceFilenameOption', 'default', 'false', 'boolean', NULL, 1),
278 -(104, 'KnowledgeTree', 'The Location of the Mime Magic File', 'The path to the mime magic database file.', 'magicDatabase', 'default', '/usr/share/file/magic', 'string', NULL, 1); 278 +(104, 'KnowledgeTree', 'The Location of the Mime Magic File', 'The path to the mime magic database file.', 'magicDatabase', 'default', '/usr/share/file/magic', 'string', NULL, 1),
  279 +(105, 'search', 'Maximum results from SQL query', 'The maximum results from an SQL query', 'maxSqlResults', 'default', '1000', 'numeric_string', NULL, 1);
279 /*!40000 ALTER TABLE `config_settings` ENABLE KEYS */; 280 /*!40000 ALTER TABLE `config_settings` ENABLE KEYS */;
280 UNLOCK TABLES; 281 UNLOCK TABLES;
281 282
@@ -1727,7 +1728,8 @@ INSERT INTO `upgrades` VALUES @@ -1727,7 +1728,8 @@ INSERT INTO `upgrades` VALUES
1727 (206,'sql*3.5.3*0*3.5.3/doc_tran_user_index.sql','Add index on user_id to document transactions table.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'), 1728 (206,'sql*3.5.3*0*3.5.3/doc_tran_user_index.sql','Add index on user_id to document transactions table.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
1728 (207,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'), 1729 (207,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
1729 (208,'func*3.5.4*7*createIndexes','Recreate db integrity:Create indexes on the database','2008-10-01 00:00:00',1,'upgrade*3.5.4*99*upgrade3.5.4'), 1730 (208,'func*3.5.4*7*createIndexes','Recreate db integrity:Create indexes on the database','2008-10-01 00:00:00',1,'upgrade*3.5.4*99*upgrade3.5.4'),
1730 -(209,'upgrade*3.5.4*99*upgrade3.5.4','Upgrade from version 3.5.3 to 3.5.4','2008-10-01 00:00:00',1,'upgrade*3.5.4*99*upgrade3.5.4'); 1731 +(209,'sql*3.5.4*0*3.5.4/max_sql_search_results.sql','Add configurable maximum results for SQL search queries.','2008-07-30 00:00:00',1,'upgrade*3.5.4*99*upgrade3.5.4'),
  1732 +(210,'upgrade*3.5.4*99*upgrade3.5.4','Upgrade from version 3.5.3 to 3.5.4','2008-10-01 00:00:00',1,'upgrade*3.5.4*99*upgrade3.5.4');
1731 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; 1733 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1732 UNLOCK TABLES; 1734 UNLOCK TABLES;
1733 1735
@@ -2658,7 +2660,7 @@ UNLOCK TABLES; @@ -2658,7 +2660,7 @@ UNLOCK TABLES;
2658 LOCK TABLES `zseq_upgrades` WRITE; 2660 LOCK TABLES `zseq_upgrades` WRITE;
2659 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */; 2661 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
2660 INSERT INTO `zseq_upgrades` VALUES 2662 INSERT INTO `zseq_upgrades` VALUES
2661 -(209); 2663 +(210);
2662 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */; 2664 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
2663 UNLOCK TABLES; 2665 UNLOCK TABLES;
2664 2666
sql/mysql/upgrade/3.5.4/max_sql_search_results.sql 0 → 100644
  View file @d72a849