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

Commit 293e5fa

Browse files
author
Charles Ma
committed
BUG: refs #179 fixed dashboard
1 parent 89c13ba commit 293e5fa

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

core/controllers/AdminController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function taskAction()
6363

6464
$modules = Zend_Registry::get('notifier')->modules;
6565
$tasks = Zend_Registry::get('notifier')->tasks;
66-
call_user_func(array($modules[$tasks[$task]['module']],$tasks[$task]['method']), $params);
66+
call_user_func(array($modules[$tasks[$task]['module']], $tasks[$task]['method']), $params);
6767
$this->disableLayout();
6868
$this->disableView();
6969
}

core/layouts/layout.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ echo $this->doctype()
242242
</div>
243243
<div class="Footer"><a href="http://www.kitware.com/products/midas.html">MIDAS</a> <?php echo $this->version ?> by <a href="http://www.kitware.com">Kitware</a> © <?php echo date("Y") ?> -
244244
<?php
245-
echo $this->t('Generated in').' '.$this->generatedTimer." ms";
245+
echo $this->t('Generated in').' '.$this->generatedTimer." s";
246246
?>
247247
- <a href="http://public.kitware.com/Bug/my_view_page.php"><?php echo $this->t('Report bug');?></a>
248248
</div>

core/models/base/ItemModelBase.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function save($dao)
6969
$index = $component->getLuceneItemIndex();
7070

7171
$hits = $index->find("item_id:".$dao->getKey());
72-
foreach ($hits as $hit)
72+
foreach($hits as $hit)
7373
{
7474
$index->delete($hit->id);
7575
}
@@ -82,19 +82,22 @@ public function save($dao)
8282
$revisionModel = $modelLoad->loadModel('ItemRevision');
8383
$revision = $this->getLastRevision($dao);
8484

85-
$metadata = $revisionModel->getMetadata($revision);
86-
$metadataString = '';
87-
88-
foreach($metadata as $m)
89-
{
90-
$doc->addField(Zend_Search_Lucene_Field::Keyword($m->getElement().'-'.$m->getQualifier(), $m->getValue()));
91-
if(!is_numeric($m->getValue()))
85+
if($revision != false)
86+
{
87+
$metadata = $revisionModel->getMetadata($revision);
88+
$metadataString = '';
89+
90+
foreach($metadata as $m)
9291
{
93-
$metadataString.=' '. $m->getValue();
92+
$doc->addField(Zend_Search_Lucene_Field::Keyword($m->getElement().'-'.$m->getQualifier(), $m->getValue()));
93+
if(!is_numeric($m->getValue()))
94+
{
95+
$metadataString .= ' '. $m->getValue();
96+
}
9497
}
98+
99+
$doc->addField(Zend_Search_Lucene_Field::Text('metadata', $metadataString));
95100
}
96-
97-
$doc->addField(Zend_Search_Lucene_Field::Text('metadata', $metadataString));
98101
$index->addDocument($doc);
99102
$index->commit();
100103
}

core/models/pdo/ItemModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function delete($itemdao)
210210
$index = $component->getLuceneItemIndex();
211211

212212
$hits = $index->find("item_id:".$itemdao->getKey());
213-
foreach ($hits as $hit)
213+
foreach($hits as $hit)
214214
{
215215
$index->delete($hit->id);
216216
}

tmp/cache/searchIndex/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)