Commit 79a4b9f066a6d3202ebbc64bce14ab3d172e9841
Merge branch 'master' of git@github.com:ktgit/knowledgetree
Showing
2 changed files
with
9 additions
and
32 deletions
search2/search/fields/FolderField.inc.php
| @@ -43,7 +43,8 @@ class FolderField extends DBFieldExpr | @@ -43,7 +43,8 @@ class FolderField extends DBFieldExpr | ||
| 43 | { | 43 | { |
| 44 | parent::__construct('full_path', 'documents', _kt('Folder')); | 44 | parent::__construct('full_path', 'documents', _kt('Folder')); |
| 45 | $this->setAlias('Folder'); | 45 | $this->setAlias('Folder'); |
| 46 | - $this->isValueQuoted(false); | 46 | + // do want values quoted for folder db search |
| 47 | + /*$this->isValueQuoted(false);*/ | ||
| 47 | } | 48 | } |
| 48 | 49 | ||
| 49 | public function getInputRequirements() | 50 | public function getInputRequirements() |
| @@ -59,14 +60,17 @@ class FolderField extends DBFieldExpr | @@ -59,14 +60,17 @@ class FolderField extends DBFieldExpr | ||
| 59 | public function modifyName($sql) | 60 | public function modifyName($sql) |
| 60 | { | 61 | { |
| 61 | $this->path = $sql; | 62 | $this->path = $sql; |
| 62 | - return "case when position('/' in $sql) = 0 then '/' else reverse(substring(reverse($sql) from position('/' in reverse($sql)) + 1 )) end"; | 63 | + return "case when position('/' in $sql) = 0 then '/' " |
| 64 | + . "else reverse(substring(reverse($sql) from position('/' in reverse($sql)) + 1 )) end"; | ||
| 63 | } | 65 | } |
| 64 | 66 | ||
| 65 | - | 67 | + // do not want to modify the value for a folder search |
| 68 | + /* | ||
| 66 | public function modifyValue($value) | 69 | public function modifyValue($value) |
| 67 | { | 70 | { |
| 68 | return "case when position('/' in $this->path) = 0 then '/' else '$value' end"; | 71 | return "case when position('/' in $this->path) = 0 then '/' else '$value' end"; |
| 69 | } | 72 | } |
| 73 | + */ | ||
| 70 | 74 | ||
| 71 | } | 75 | } |
| 72 | 76 |
sql/mysql/upgrade/3.6.1/search_ranking.sql
| 1 | -CREATE TABLE `search_ranking` ( | ||
| 2 | - `groupname` varchar(100) NOT NULL, | ||
| 3 | - `itemname` varchar(100) NOT NULL, | ||
| 4 | - `ranking` float default '0', | ||
| 5 | - `type` enum('T','M','S') default 'T' COMMENT 'T=Table, M=Metadata, S=Searchable', | ||
| 6 | - PRIMARY KEY (`groupname`,`itemname`) | ||
| 7 | -) ENGINE=innodb DEFAULT CHARSET=utf8; | ||
| 8 | - | ||
| 9 | - | ||
| 10 | -INSERT INTO `search_ranking` VALUES | ||
| 11 | - ('Discussion','',150,'S'), | ||
| 12 | - ('documents','checked_out_user_id',1,'T'), | ||
| 13 | - ('documents','created',1,'T'), | ||
| 14 | - ('documents','creator_id',1,'T'), | ||
| 15 | - ('documents','id',1,'T'), | ||
| 16 | - ('documents','immutable',1,'T'), | ||
| 17 | - ('documents','is_checked_out',1,'T'), | ||
| 18 | - ('documents','modified',1,'T'), | ||
| 19 | - ('documents','modified_user_id',1,'T'), | ||
| 20 | - ('documents','title',300,'T'), | ||
| 21 | - ('DocumentText','',100,'S'), | ||
| 22 | - ('document_content_version','filename',10,'T'), | ||
| 23 | - ('document_content_version','filesize',1,'T'), | ||
| 24 | - ('document_fields_link','value',1,'T'), | ||
| 25 | - ('document_metadata_version','document_type_id',1,'T'), | ||
| 26 | - ('document_metadata_version','name',300,'T'), | ||
| 27 | - ('document_metadata_version','workflow_id',1,'T'), | ||
| 28 | - ('document_metadata_version','workflow_state_id',1,'T'), | ||
| 29 | - ('tag_words','tag',1,'T'); | ||
| 30 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +UPDATE `search_ranking` SET ranking = 300 WHERE groupname = 'document_metadata_version' AND itemname = 'name'; | ||
| 3 | +INSERT INTO `search_ranking` VALUES ('document_fields_link','value',1,'T'); | ||
| 31 | \ No newline at end of file | 4 | \ No newline at end of file |