Author: sevein
Date: Thu May 3 16:22:11 2012
New Revision: 11620
Log:
Cosmetic changes, build i18n doc with nested actor properties, level of
description lookup table
Modified:
branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
Modified: branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
Thu May 3 16:21:28 2012 (r11619)
+++ branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
Thu May 3 16:22:11 2012 (r11620)
@@ -19,12 +19,13 @@
class SearchIndexAction extends sfAction
{
- public $facets = array(
- 'repository.id',
- 'subjects.id',
- 'digitalObject.mediaTypeId',
- 'places.id',
- 'names.id');
+ public static
+ $FACETS = array(
+ 'repository.id',
+ 'subjects.id',
+ 'digitalObject.mediaTypeId',
+ 'places.id',
+ 'names.id');
public function execute($request)
{
@@ -97,18 +98,11 @@
if ($this->pager->hasResults())
{
- // pre-populate some lookup tables for multilingual values
- $this->pager->levelsOfDescription = array();
- foreach (QubitTerm::getLevelsOfDescription() as $lod)
- {
- $this->pager->levelsOfDescription[$lod->id] =
$lod->getName(array('cultureFallback' => true, 'culture' =>
$this->context->user->getCulture()));
- }
-
+ // Pre-populate some lookup tables for multilingual values
if ($resultSet->hasFacets())
{
$facets = array();
- // build lookup tables for I18nized values
foreach ($resultSet->getFacets() as $name => $facet)
{
if (isset($facet['terms']))
@@ -228,6 +222,12 @@
$this->pager->facets = $facets;
}
+ $this->pager->levelsOfDescription = array();
+ foreach (QubitTerm::getLevelsOfDescription() as $lod)
+ {
+ $this->pager->levelsOfDescription[$lod->id] =
$lod->getName(array('cultureFallback' => true, 'culture' =>
$this->context->user->getCulture()));
+ }
+
$ancestorsIds = array();
foreach ($this->pager->getResults() as $hit)
{
Modified:
branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
Thu May 3 16:21:28 2012 (r11619)
+++ branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
Thu May 3 16:22:11 2012 (r11620)
@@ -49,8 +49,8 @@
<ul>
<?php foreach ($repositories->getResults() as $hit): ?>
- <?php $doc = build_i18n_doc($hit) ?>
- <li><?php echo
link_to(($doc[$sf_user->getCulture()]['authorizedFormOfName'] ?:
$doc[$doc['sourceCulture']]['authorizedFormOfName']), array('module' =>
'repository', 'slug' => $doc['slug'])) ?></li>
+ <?php $doc = build_i18n_doc($hit, array('actor')) ?>
+ <li><?php echo
link_to($doc['actor'][$sf_user->getCulture()]['authorizedFormOfName'],
array('module' => 'repository', 'slug' => $doc['slug'])) ?></li>
<?php endforeach; ?>
<?php if ($repositories->getTotalHits() > 3): ?>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
