ENH: Multi keywords search

https://www.kitware.com/Bug/view.php?id=9584

Author: Charles Marion

core/controllers/ImportController.php

@@ -133,12 +133,28 @@ private function _recursiveParseDirectory($path,$currentdir)
           $item->setName($fileInfo->getFilename());
           $this->Item->save($item);
 
+          
           // Set the keyword for the item
-          $keyword = new ItemKeywordDao;
+          $keyword = new ItemKeywordDao();
           $keyword->setValue($fileInfo->getFilename());
           $this->ItemKeyword->insertKeyword($keyword);
-          
-          $this->Item->addKeyword($item,$keyword);
+          $this->Item->addKeyword($item,$keyword);  
+
+          $tmp=str_replace('.', ' ', $fileInfo->getFilename());
+          $tmp=str_replace('_', ' ', $tmp);
+          $tmp=str_replace('-', ' ', $tmp);
+
+          $keywords=explode(' ', $tmp);
+          if(count($keywords)>1)
+            {
+            foreach ($keywords as $key => $value)
+              {
+              $keyword = new ItemKeywordDao();
+              $keyword->setValue($value);
+              $this->ItemKeyword->insertKeyword($keyword);
+              $this->Item->addKeyword($item,$keyword);  
+              }
+            }  
 
           // Set the policy of the item
           $this->Itempolicyuser->createPolicy($this->userSession->Dao,$item,MIDAS_POLICY_ADMIN);    

core/controllers/UploadController.php

@@ -167,11 +167,6 @@ private function createUploadedItem($userDao,$name,$path,$privacy=null)
       $item->setThumbnail('');
       $this->Item->save($item);
 
-      // Set the keyword for the item
-      $keyword = new ItemKeywordDao();
-      $keyword->setValue($name);
-      $this->ItemKeyword->insertKeyword($keyword);
-      
       $feed=$this->Feed->createFeed($this->userSession->Dao,MIDAS_FEED_CREATE_ITEM,$item);
       if(isset($privacy)&&$privacy=='public')
         {
@@ -192,9 +187,29 @@ private function createUploadedItem($userDao,$name,$path,$privacy=null)
       $itemRevisionDao->setUser_id($userDao->getKey());
       $itemRevisionDao->setDate(date('c'));
       $this->Item->addRevision($item,$itemRevisionDao);
-
-      $this->Item->addKeyword($item,$keyword);      
 
+      // Set the keyword for the item
+      $keyword = new ItemKeywordDao();
+      $keyword->setValue($name);
+      $this->ItemKeyword->insertKeyword($keyword);
+      $this->Item->addKeyword($item,$keyword);  
+
+      $tmp=str_replace('.', ' ', $name);
+      $tmp=str_replace('_', ' ', $tmp);
+      $tmp=str_replace('-', ' ', $tmp);
+
+      $keywords=explode(' ', $tmp);
+      if(count($keywords)>1)
+        {
+        foreach ($keywords as $key => $value)
+          {
+          $keyword = new ItemKeywordDao();
+          $keyword->setValue($value);
+          $this->ItemKeyword->insertKeyword($keyword);
+          $this->Item->addKeyword($item,$keyword);  
+          }
+        }      
+
       // Add bitstreams to the revision
       $bitstreamDao = new BitstreamDao;
       $bitstreamDao->setName($name);

core/models/pdo/ItemKeywordModel.php

@@ -30,28 +30,60 @@ function getItemsFromSearch($searchterm,$userDao,$limit=14,$group=true,$order='v
         }
       }
 
+    $searchterms=explode(' ', $searchterm);
     // Apparently it's slow to do a like in a subquery so we run it first  
-    $sql = $this->database->select()->from(array('itemkeyword'),array('keyword_id'))
-                   ->where('value LIKE ?','%'.$searchterm.'%');                 
-    $ids = '(';
+    $sql = $this->database->select()->from(array('i'=>'itemkeyword'),array())
+                ->setIntegrityCheck(false);
+    $sql->join(array('i2k' => 'item2keyword'),'i.keyword_id=i2k.keyword_id',array('item_id'));
+    
+    if(empty($searchterms))
+      {
+      return array();
+      }
+    
+    foreach($searchterms as $key=>$term)
+      {
+      if($key==0)
+        {
+        $sql->where('value LIKE ?','%'.$term.'%'); 
+        }
+      else
+        {
+        $sql->orWhere('value LIKE ?','%'.$term.'%'); 
+        }
+      }
+                                   
     $rowset = $this->database->fetchAll($sql);
     $return = array();
+    $itemIdsCount=array();
+    $itemIds=array();
     foreach($rowset as $row)
       {
-      if($ids != '(')
+      if(isset($itemIdsCount[$row->item_id]))
         {
-        $ids .= ',';  
-        } 
-      $ids .= $row->keyword_id;
+        $itemIdsCount[$row->item_id]++;
+        }
+      else
+        {
+        $itemIdsCount[$row->item_id]=1;
+        }
       }
-    $ids .= ')';
-
-    // If we don't have any data we return
-    if(count($rowset) == 0)
+    foreach($itemIdsCount as $key=>$n)
       {
-      return $return;  
+      if($n<count($searchterms))
+        {
+        unset($itemIdsCount[$key]);
+        }
+      else
+        {
+        $itemIds[]=$key;
+        }
+      }
+      
+    if(empty($itemIds))
+      {
+      return array();
       }
-    
     $sql=$this->database->select();
     if($group)
       {
@@ -62,7 +94,6 @@ function getItemsFromSearch($searchterm,$userDao,$limit=14,$group=true,$order='v
       $sql->from(array('i' => 'item'));
       }
 
-    $sql->join(array('i2k' => 'item2keyword'),'i.item_id=i2k.item_id');
     if(!$isAdmin)
       {
       $sql ->joinLeft(array('ipu' => 'itempolicyuser'),'
@@ -85,7 +116,7 @@ function getItemsFromSearch($searchterm,$userDao,$limit=14,$group=true,$order='v
             );
       }
     $sql->setIntegrityCheck(false)  
-          ->where('i2k.keyword_id IN '.$ids)             
+          ->where('i.item_id IN   (?)',$itemIds)             
           ->limit($limit)
           ;
 
@@ -107,7 +138,6 @@ function getItemsFromSearch($searchterm,$userDao,$limit=14,$group=true,$order='v
         $sql->order(array('i.view DESC'));
         break;
       }
-      
     $rowset = $this->database->fetchAll($sql);
     foreach($rowset as $row)
       {
@@ -130,7 +160,7 @@ function insertKeyword($keyword)
       {
       throw new Zend_Exception("Should be a keyword" );
       }
-
+      
     // Check if the keyword already exists
     $row = $this->database->fetchRow($this->database->select()->from($this->_name)
                                           ->where('value=?',$keyword->getValue()));