Merge branch 'master' of git@github.com:ktgit/knowledgetree

Kevin G Fourie
2 parents 51994621 76bf57d1
Showing 5 changed files with 75 additions and 5 deletions
search2/search/expr.inc.php
search2/search/fields/AnyMetadataField.inc.php
search2/search/fields/TitleField.inc.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.6.1/search_ranking.sql
@@ -1079,6 +1079,7 @@ class SQLQueryBuilder implements QueryBuilder
 		        if (array_key_exists($tablename, $this->used_tables))
 		        {
 		            $this->used_tables[$tablename]++;
+                    if (isset($expr->references)) ++$expr->references;
 		        }
 		    }
 		}
@@ -1244,7 +1245,18 @@ class SQLQueryBuilder implements QueryBuilder
             }
             if ($this->used_tables['document_fields_link'] > 0)
             {
-                $sql .= ' LEFT JOIN document_fields_link pdfl ON dmv.id=pdfl.metadata_version_id ' . "\n";
+                // NOTE this is a bit of a hack, maybe? or maybe it really is the best way?
+                // ...what about using the loop below which checks the expression
+                // for a join table rather than this up here? - otherwise this only
+                // affects this particular query type - then again maybe that's what we want...
+                for ($i = 0; $i < $this->used_tables['document_fields_link']; ++$i)
+                {
+                    if ($i > 0) $counter = $i;
+                    else $counter = '';
+
+                    $sql .= ' LEFT JOIN document_fields_link pdfl' . $counter . ' '
+                         .  'ON dmv.id=pdfl' . $counter . '.metadata_version_id ' . "\n";
+                }
             }
             if ($this->used_tables['tag_words'] > 0)
@@ -1374,7 +1386,6 @@ class SQLQueryBuilder implements QueryBuilder
 	public function buildComplexQuery($expr)
 	{
-//		print "building complex \n\n";
 		$this->exploreExprs($expr);
 		$sql = $this->buildCoreSQL();
@@ -1396,7 +1407,6 @@ class SQLQueryBuilder implements QueryBuilder
 	public function buildSimpleQuery($op, $group)
 	{
-//		print "building simple \n\n";
 		$this->exploreGroup($group);
         $sql = $this->buildCoreSQL();
@@ -40,7 +40,7 @@
 class AnyMetadataField extends DBFieldExpr
 {
 	public $general_op = ExprOp::CONTAINS;
-
+    public $references = 0;
     public function __construct()
     {
@@ -48,6 +48,34 @@ class AnyMetadataField extends DBFieldExpr
         $this->setAlias('Metadata');
     }
+    /*
+     * Overridden function to adjust table alias in cases of
+     * the document_fields_link table being included more than once
+     *
+     * NOTE this only works in conjunction with code in expr.inc.php which adds the left joins to the db query.
+     *      I don't like this and think we should look for a way to make the table joining more generic
+     *      such that it can be controlled via these classes and thereby contained as a unit.
+     */
+    public function modifyName($name)
+    {
+        if ($this->references > 0)
+        {
+            static $count = 0;
+            if ($count >= $this->references)
+            {
+                $count = 0;
+            }
+
+            if ((($pos = strpos($name, '.')) !== false) && ($count != 0))
+            {
+                $name = substr($name, 0, $pos) . $count . substr($name, $pos);
+            }
+            ++$count;
+        }
+
+    	return $name;
+    }
+
     public function getInputRequirements()
     {
         return array('value'=>array('type'=>FieldInputType::TEXT));
@@ -39,6 +39,8 @@
 class TitleField extends DBFieldExpr
 {
+    public $general_op = ExprOp::CONTAINS;
+    
     public function __construct()
     {
         parent::__construct('name', 'document_metadata_version', _kt('Title'));
@@ -1407,8 +1407,9 @@ INSERT INTO `search_ranking` VALUES
 ('DocumentText','',100,'S'),
 ('document_content_version','filename',10,'T'),
 ('document_content_version','filesize',1,'T'),
+('document_fields_link','value',1,'T'),
 ('document_metadata_version','document_type_id',1,'T'),
-('document_metadata_version','name',1,'T'),
+('document_metadata_version','name',300,'T'),
 ('document_metadata_version','workflow_id',1,'T'),
 ('document_metadata_version','workflow_state_id',1,'T'),
 ('tag_words','tag',1,'T');
+CREATE TABLE `search_ranking` (
+	`groupname` varchar(100) NOT NULL,
+	`itemname` varchar(100) NOT NULL,
+	`ranking` float default '0',
+	`type` enum('T','M','S') default 'T' COMMENT 'T=Table, M=Metadata, S=Searchable',
+	PRIMARY KEY  (`groupname`,`itemname`)
+) ENGINE=innodb DEFAULT CHARSET=utf8;
+
+
+INSERT INTO `search_ranking` VALUES
+    ('Discussion','',150,'S'),
+    ('documents','checked_out_user_id',1,'T'),
+    ('documents','created',1,'T'),
+    ('documents','creator_id',1,'T'),
+    ('documents','id',1,'T'),
+    ('documents','immutable',1,'T'),
+    ('documents','is_checked_out',1,'T'),
+    ('documents','modified',1,'T'),
+    ('documents','modified_user_id',1,'T'),
+    ('documents','title',300,'T'),
+    ('DocumentText','',100,'S'),
+    ('document_content_version','filename',10,'T'),
+    ('document_content_version','filesize',1,'T'),
+    ('document_fields_link','value',1,'T'),
+    ('document_metadata_version','document_type_id',1,'T'),
+    ('document_metadata_version','name',300,'T'),
+    ('document_metadata_version','workflow_id',1,'T'),
+    ('document_metadata_version','workflow_state_id',1,'T'),
+    ('tag_words','tag',1,'T');
 \ No newline at end of file