Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 24a7fd4

Browse files
author
Charles Ma
committed
ENH: refs #217 removed itemkeyword table/models/dao
1 parent aefb9c2 commit 24a7fd4

16 files changed

+177
-440
lines changed

‎core/AppController.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,6 @@ protected function t($text)
406406
*/
407407
var $Group;
408408
/**
409-
* ItemKeyword Model
410-
* @var ItemKeywordModelBase
411-
*/
412-
var $ItemKeyword;
413-
/**
414409
* Item Model
415410
* @var ItemModelBase
416411
*/

‎core/controllers/ImportController.php‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
class ImportController extends AppController
1818
{
19-
public $_models = array('Item', 'Folder', 'ItemRevision', 'Assetstore', 'Folderpolicyuser', 'Itempolicyuser', 'ItemKeyword', 'Itempolicygroup', 'Group', 'Folderpolicygroup');
20-
public $_daos = array('Item', 'Folder', 'ItemRevision', 'Bitstream', 'Assetstore', 'ItemKeyword');
19+
public $_models = array('Item', 'Folder', 'ItemRevision', 'Assetstore', 'Folderpolicyuser', 'Itempolicyuser', 'Itempolicygroup', 'Group', 'Folderpolicygroup');
20+
public $_daos = array('Item', 'Folder', 'ItemRevision', 'Bitstream', 'Assetstore');
2121
public $_components = array('Upload', 'Utility');
2222
public $_forms = array('Import', 'Assetstore');
2323

@@ -152,28 +152,6 @@ private function _recursiveParseDirectory($path, $currentdir)
152152
$item->setName($fileInfo->getFilename());
153153
$this->Item->save($item);
154154

155-
// Set the keyword for the item
156-
$keyword = new ItemKeywordDao();
157-
$keyword->setValue($fileInfo->getFilename());
158-
$this->ItemKeyword->insertKeyword($keyword);
159-
$this->Item->addKeyword($item, $keyword);
160-
161-
$tmp = str_replace('.', ' ', $fileInfo->getFilename());
162-
$tmp = str_replace('_', ' ', $tmp);
163-
$tmp = str_replace('-', ' ', $tmp);
164-
165-
$keywords = explode(' ', $tmp);
166-
if(count($keywords) > 1)
167-
{
168-
foreach($keywords as $key => $value)
169-
{
170-
$keyword = new ItemKeywordDao();
171-
$keyword->setValue($value);
172-
$this->ItemKeyword->insertKeyword($keyword);
173-
$this->Item->addKeyword($item, $keyword);
174-
}
175-
}
176-
177155
// Set the policy of the item
178156
$this->Itempolicyuser->createPolicy($this->userSession->Dao, $item, MIDAS_POLICY_ADMIN);
179157
$anonymousGroup = $this->Group->load(MIDAS_GROUP_ANONYMOUS_KEY);

‎core/controllers/SearchController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
class SearchController extends AppController
1717
{
18-
public $_models = array('ItemKeyword', 'Item', 'Folder', 'User', 'Community', 'Group');
19-
public $_daos = array('ItemKeyword', 'Item', 'Folder', 'User', 'Community');
18+
public $_models = array('Item', 'Folder', 'User', 'Community', 'Group');
19+
public $_daos = array('Item', 'Folder', 'User', 'Community');
2020
public $_components = array('Sortdao', 'Date', 'Utility', 'Search');
2121

2222
/** Init Controller */
@@ -128,7 +128,7 @@ public function liveAction()
128128
else
129129
{
130130
// Search for the items
131-
$ItemsDao = $this->ItemKeyword->getItemsFromSearch($search, $this->userSession->Dao);
131+
$ItemsDao = $this->Item->getItemsFromSearch($search, $this->userSession->Dao);
132132

133133
// Search for the folders
134134
$FoldersDao = $this->Folder->getFoldersFromSearch($search, $this->userSession->Dao);

‎core/controllers/UploadController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
/** Upload Controller */
1414
class UploadController extends AppController
1515
{
16-
public $_models = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Folder', 'Itempolicyuser', "ItemKeyword", 'Itempolicygroup', 'Group', 'Feed', "Feedpolicygroup", "Feedpolicyuser", 'Bitstream', 'Assetstore');
17-
public $_daos = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Bitstream', 'Folder', "ItemKeyword");
16+
public $_models = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Folder', 'Itempolicyuser', 'Itempolicygroup', 'Group', 'Feed', "Feedpolicygroup", "Feedpolicyuser", 'Bitstream', 'Assetstore');
17+
public $_daos = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Bitstream', 'Folder');
1818
public $_components = array('Httpupload', 'Upload');
1919
public $_forms = array('Upload');
2020

‎core/controllers/components/SearchComponent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function getLuceneItemIndex()
3737
public function searchAll($userDao, $search, $order)
3838
{
3939
$modelLoad = new MIDAS_ModelLoader();
40-
$itemModel = $modelLoad->loadModel('ItemKeyword');
40+
$itemModel = $modelLoad->loadModel('Item');
4141
$folderModel = $modelLoad->loadModel('Folder');
4242
$communityModel = $modelLoad->loadModel('Community');
4343
$userModel = $modelLoad->loadModel('User');

‎core/controllers/components/UploadComponent.php‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public function createLinkItem($userDao, $name, $url, $parent = null)
109109
$itemRevisionModel = $modelLoad->loadModel('ItemRevision');
110110
$feedpolicyuserModel = $modelLoad->loadModel('Feedpolicyuser');
111111
$itempolicyuserModel = $modelLoad->loadModel('Itempolicyuser');
112-
$itemKeywordModel = $modelLoad->loadModel('ItemKeyword');
113112

114113
if($userDao == null)
115114
{
@@ -152,30 +151,7 @@ public function createLinkItem($userDao, $name, $url, $parent = null)
152151
$itemRevisionDao->setUser_id($userDao->getKey());
153152
$itemRevisionDao->setDate(date('c'));
154153
$itemRevisionDao->setLicense(null);
155-
$itemModel->addRevision($item, $itemRevisionDao);
156-
157-
// Set the keyword for the item
158-
Zend_Loader::loadClass("ItemKeywordDao", BASE_PATH . '/core/models/dao');
159-
$keyword = new ItemKeywordDao();
160-
$keyword->setValue($name);
161-
$itemKeywordModel->insertKeyword($keyword);
162-
$itemModel->addKeyword($item, $keyword);
163-
164-
$tmp = str_replace('.', ' ', $name);
165-
$tmp = str_replace('_', ' ', $tmp);
166-
$tmp = str_replace('-', ' ', $tmp);
167-
168-
$keywords = explode(' ', $tmp);
169-
if(count($keywords) > 1)
170-
{
171-
foreach($keywords as $key => $value)
172-
{
173-
$keyword = new ItemKeywordDao();
174-
$keyword->setValue($value);
175-
$itemKeywordModel->insertKeyword($keyword);
176-
$itemModel->addKeyword($item, $keyword);
177-
}
178-
}
154+
$itemModel->addRevision($item, $itemRevisionDao);
179155

180156
// Add bitstreams to the revision
181157
Zend_Loader::loadClass("BitstreamDao", BASE_PATH . '/core/models/dao');
@@ -210,7 +186,6 @@ public function createUploadedItem($userDao, $name, $path, $parent = null, $lice
210186
$itemRevisionModel = $modelLoad->loadModel('ItemRevision');
211187
$feedpolicyuserModel = $modelLoad->loadModel('Feedpolicyuser');
212188
$itempolicyuserModel = $modelLoad->loadModel('Itempolicyuser');
213-
$itemKeywordModel = $modelLoad->loadModel('ItemKeyword');
214189

215190
if($userDao == null)
216191
{
@@ -254,29 +229,7 @@ public function createUploadedItem($userDao, $name, $path, $parent = null, $lice
254229
$itemRevisionDao->setDate(date('c'));
255230
$itemRevisionDao->setLicense($license);
256231
$itemModel->addRevision($item, $itemRevisionDao);
257-
258-
// Set the keyword for the item
259-
Zend_Loader::loadClass("ItemKeywordDao", BASE_PATH . '/core/models/dao');
260-
$keyword = new ItemKeywordDao();
261-
$keyword->setValue($name);
262-
$itemKeywordModel->insertKeyword($keyword);
263-
$itemModel->addKeyword($item, $keyword);
264-
265-
$tmp = str_replace('.', ' ', $name);
266-
$tmp = str_replace('_', ' ', $tmp);
267-
$tmp = str_replace('-', ' ', $tmp);
268-
269-
$keywords = explode(' ', $tmp);
270-
if(count($keywords) > 1)
271-
{
272-
foreach($keywords as $key => $value)
273-
{
274-
$keyword = new ItemKeywordDao();
275-
$keyword->setValue($value);
276-
$itemKeywordModel->insertKeyword($keyword);
277-
$itemModel->addKeyword($item, $keyword);
278-
}
279-
}
232+
280233

281234
// Add bitstreams to the revision
282235
Zend_Loader::loadClass("BitstreamDao", BASE_PATH . '/core/models/dao');

‎core/database/upgrade/3.1.1.php‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
class Upgrade_3_1_1 extends MIDASUpgrade
4+
{
5+
public function preUpgrade()
6+
{
7+
}
8+
9+
public function mysql()
10+
{
11+
$this->db->query('DROP TABLE itemkeyword');
12+
$this->db->query('DROP TABLE item2keyword');
13+
}
14+
15+
16+
public function pgsql()
17+
{
18+
$this->db->query('DROP TABLE itemkeyword');
19+
$this->db->query('DROP TABLE item2keyword');
20+
}
21+
22+
public function postUpgrade()
23+
{
24+
}
25+
}
26+
?>
27+
28+

‎core/models/base/ItemKeywordModelBase.php‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎core/models/base/ItemModelBase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public function __construct()
3535
'uuid' => array('type' => MIDAS_DATA),
3636
'folders' => array('type' => MIDAS_MANY_TO_MANY, 'model' => 'Folder', 'table' => 'item2folder', 'parent_column' => 'item_id', 'child_column' => 'folder_id'),
3737
'revisions' => array('type' => MIDAS_ONE_TO_MANY, 'model' => 'ItemRevision', 'parent_column' => 'item_id', 'child_column' => 'item_id'),
38-
'keywords' => array('type' => MIDAS_MANY_TO_MANY, 'model' => 'ItemKeyword', 'table' => 'item2keyword', 'parent_column' => 'item_id', 'child_column' => 'keyword_id'),
3938
'itempolicygroup' => array('type' => MIDAS_ONE_TO_MANY, 'model' => 'Itempolicygroup', 'parent_column' => 'item_id', 'child_column' => 'item_id'),
4039
'itempolicyuser' => array('type' => MIDAS_ONE_TO_MANY, 'model' => 'Itempolicyuser', 'parent_column' => 'item_id', 'child_column' => 'item_id'),
4140
);
@@ -51,6 +50,7 @@ abstract function getMostPopulars($userDao, $limit = 20);
5150
abstract function getRandomThumbnails($userDao = null, $policy = 0, $limit = 10, $thumbnailFilter = false);
5251
abstract function getByUuid($uuid);
5352
abstract function getAll();
53+
abstract function getItemsFromSearch($searchterm, $userDao, $limit = 14, $group = true, $order = 'view');
5454

5555
/** save */
5656
public function save($dao)

‎core/models/cassandra/ItemKeywordModel.php‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)