Author: sevein
Date: Sun Apr 29 00:06:13 2012
New Revision: 11550
Log:
Fixes and changes to avoid PHP warnings
Modified:
branches/2.0/apps/qubit/modules/search/actions/advancedAction.class.php
branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
branches/2.0/apps/qubit/modules/search/templates/_searchResults.php
Modified:
branches/2.0/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/actions/advancedAction.class.php
Sun Apr 29 00:02:55 2012 (r11549)
+++ branches/2.0/apps/qubit/modules/search/actions/advancedAction.class.php
Sun Apr 29 00:06:13 2012 (r11550)
@@ -37,13 +37,16 @@
$this->form->bind($request->getRequestParameters() +
$request->getGetParameters() + $request->getPostParameters());
$exist = false;
- foreach ($this->request->searchFields as $item)
+ if (isset($this->request->searchFields))
{
- if (!empty($item['query']))
+ foreach ($this->request->searchFields as $item)
{
- $exist = true;
+ if (!empty($item['query']))
+ {
+ $exist = true;
- break;
+ break;
+ }
}
}
Modified: branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
Sun Apr 29 00:02:55 2012 (r11549)
+++ branches/2.0/apps/qubit/modules/search/actions/indexAction.class.php
Sun Apr 29 00:06:13 2012 (r11550)
@@ -97,6 +97,7 @@
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()));
@@ -106,7 +107,10 @@
{
$facets = array();
+ $this->pager->ancestors = array();
+
// build lookup tables for I18nized values
+ // echo "<pre>"; var_dump($resultSet->getFacets()); die();
foreach ($resultSet->getFacets() as $name => $facet)
{
if (isset($facet['terms']))
@@ -134,8 +138,9 @@
foreach ($ancestors as $ancestor)
{
- $this->pager->ancestors[$ancestor->id] = array('slug' =>
$ancestor->slug,
- 'title' =>
$ancestor->getTitle(array('cultureFallback' => true, 'culture' =>
$this->context->user->getCulture())));
+ $this->pager->ancestors[$ancestor->id] = array(
+ 'slug' => $ancestor->slug,
+ 'title' => $ancestor->getTitle(array('cultureFallback' =>
true)));
}
break;
Modified: branches/2.0/apps/qubit/modules/search/templates/_searchResults.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/templates/_searchResults.php Sun Apr
29 00:02:55 2012 (r11549)
+++ branches/2.0/apps/qubit/modules/search/templates/_searchResults.php Sun Apr
29 00:06:13 2012 (r11550)
@@ -81,7 +81,7 @@
<ul>
<li <?php if ('' == $sf_request->getParameter('subjects_id'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('subjects_id' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['subjects_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['subjects_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('subjects_id' => ($filters['subjects_id'] ? implode(',',
array_diff(array_merge($filters['subjects_id'], array($id)),
array_intersect($filters['subjects_id'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if (in_array($id, @$filters['subjects_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('subjects_id' => (@$filters['subjects_id'] ? implode(',',
array_diff(array_merge(@$filters['subjects_id'], array($id)),
array_intersect(@$filters['subjects_id'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
@@ -97,9 +97,9 @@
<div class="scrollable" id="mediatypes">
<ul>
- <li <?php if ('' ==
$sf_request->getParameter('digitalObject_mediaTypeId')) echo 'class="active"';
?>><?php echo link_to(__('All'), array('digitalObject_mediaTypeId' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if ('' ==
$sf_request->getParameter('digitalObject_mediaTypeId')) echo 'class="active"'
?>><?php echo link_to(__('All'), array('digitalObject_mediaTypeId' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php
foreach($pager->facets['digitalObject_mediaTypeId']['terms'] as $id => $term):
?>
- <li <?php if (in_array($id,
$filters['digitalObject_mediaTypeId'])) echo 'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('digitalObject_mediaTypeId' => ($filters['digitalObject_mediaTypeId'] ?
implode(',', array_diff(array_merge($filters['digitalObject_mediaTypeId'],
array($id)), array_intersect($filters['digitalObject_mediaTypeId'],
array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if (in_array($id,
@$filters['digitalObject_mediaTypeId'])) echo 'class="active"' ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('digitalObject_mediaTypeId' => (@$filters['digitalObject_mediaTypeId'] ?
implode(',', array_diff(array_merge(@$filters['digitalObject_mediaTypeId'],
array($id)), array_intersect(@$filters['digitalObject_mediaTypeId'],
array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
@@ -126,9 +126,9 @@
<div class="scrollable" id="places">
<ul>
- <li <?php if ('' == $sf_request->getParameter('places_id'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('places_id' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if ('' == $sf_request->getParameter('places_id'))
echo 'class="active"' ?>><?php echo link_to(__('All'), array('places_id' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['places_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['places_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('places_id'
=> ($filters['places_id'] ? implode(',',
array_diff(array_merge($filters['places_id'], array($id)),
array_intersect($filters['places_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if (in_array($id, @$filters['places_id'])) echo
'class="active"' ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('places_id'
=> (@$filters['places_id'] ? implode(',',
array_diff(array_merge(@$filters['places_id'], array($id)),
array_intersect(@$filters['places_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
@@ -144,9 +144,9 @@
<div class="scrollable" id="names">
<ul>
- <li <?php if ('' == $sf_request->getParameter('names_id'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('names_id' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if ('' == $sf_request->getParameter('names_id'))
echo 'class="active"' ?>><?php echo link_to(__('All'), array('names_id' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['names_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['names_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('names_id'
=> ($filters['names_id'] ? implode(',',
array_diff(array_merge($filters['names_id'], array($id)),
array_intersect($filters['names_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if (in_array($id, @$filters['names_id'])) echo
'class="active"' ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('names_id'
=> (@$filters['names_id'] ? implode(',',
array_diff(array_merge(@$filters['names_id'], array($id)),
array_intersect(@$filters['names_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
@@ -162,9 +162,9 @@
<div class="scrollable" id="languages">
<ul>
- <li <?php if ('' == $sf_request->getParameter('i18n_culture'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('i18n_culture' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if ('' == $sf_request->getParameter('i18n_culture'))
echo 'class="active"' ?>><?php echo link_to(__('All'), array('i18n_culture' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['i18n_culture']['terms'] as $id
=> $term): ?>
- <li <?php if (in_array($id, $filters['i18n_culture'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('i18n_culture' => ($filters['i18n_culture'] ? implode(',',
array_diff(array_merge($filters['i18n_culture'], array($id)),
array_intersect($filters['i18n_culture'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()) ?></li>
+ <li <?php if (in_array($id, @$filters['i18n_culture'])) echo
'class="active"' ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('i18n_culture' => (@$filters['i18n_culture'] ? implode(',',
array_diff(array_merge(@$filters['i18n_culture'], array($id)),
array_intersect(@$filters['i18n_culture'], array($id)))) : $id), 'page' =>
null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
@@ -193,7 +193,7 @@
<?php if ($numResults > 0): ?>
<div class="result media">
- <h3><a href="#"><?php echo __('%1% results with digital media',
array('%1%' => $numResults)) ?><strong><?php echo __('Show all')
?></strong></a></h3>
+ <h3><a href="#"><?php echo __('%1% results with digital media',
array('%1%' => $numResults)) ?> <strong><?php echo __('Show all')
?></strong></a></h3>
</div>
<?php endif; ?>
@@ -218,13 +218,16 @@
<?php endforeach; ?>
</ul>
- <p><?php echo
link_to($doc[$sf_user->getCulture()]['scopeAndContent'] ?:
$doc[$doc['sourceCulture']]['scopeAndContent'], array('module' =>
'informationobject', 'slug' => $doc['slug']), array('title' =>
$doc[$sf_user->getCulture()]['title'] ?: $doc[$doc['sourceCulture']]['title']))
?></p>
+ <?php if (isset($doc[$sf_user->getCulture()]['scopeAndContent'])):
?>
+ <p><?php echo $doc[$sf_user->getCulture()]['scopeAndContent']
?></p>
+ <?php endif; ?>
<p>
- <?php echo Qubit::renderDateStartEnd(null,
$doc['dates'][0]['startDate'], $doc['dates'][0]['endDate']) ?>
+ <?php if (isset($doc['dates'])): ?>
+ <?php echo Qubit::renderDateStartEnd(null,
$doc['dates'][0]['startDate'], $doc['dates'][0]['endDate']) ?>
+ <?php endif; ?>
<?php if
(!empty($doc[$doc['sourceCulture']]['creator'][0]['name'])): ?>
- <?php echo __('by %1%', // FIXME: ARRAY ENUMERATION
- array('%1%' =>
$doc[$sf_user->getCulture()]['creator'][0]['name'] ?:
$doc[$doc['sourceCulture']]['creator'][0]['name'])) ?>
+ <?php echo __('by %1%', array('%1%' =>
$doc[$sf_user->getCulture()]['creator'][0]['name'] ?:
$doc[$doc['sourceCulture']]['creator'][0]['name'])) ?>
<?php endif; ?>
</p>
--
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.
