Author: ornicar2
Date: 2010-01-24 13:44:46 +0100 (Sun, 24 Jan 2010)
New Revision: 27120
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchIndex.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchPageDocument.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextView.php
Log:
[Diem]
- fixed search index bad value for translated default widgets
- improved search index text cleaner
- improved text widget renderForIndex
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchIndex.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchIndex.php
2010-01-24 12:25:40 UTC (rev 27119)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchIndex.php
2010-01-24 12:44:46 UTC (rev 27120)
@@ -213,7 +213,7 @@
strtolower(
dmString::transliterate(
strip_tags(
- str_replace('<', ' <', $text)
+ str_replace(array("\n", '<'), array(' ', ' <'), $text)
)
)
)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchPageDocument.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchPageDocument.php
2010-01-24 12:25:40 UTC (rev 27119)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchPageDocument.php
2010-01-24 12:44:46 UTC (rev 27120)
@@ -103,7 +103,7 @@
{
foreach($zone['Widgets'] as $widget)
{
- $widget['value'] = isset($widget['Translation'][$culture]) ?
$widget['Translation'][$culture] : '';
+ $widget['value'] = isset($widget['Translation'][$culture]['value']) ?
$widget['Translation'][$culture]['value'] : '';
unset($widget['Translation']);
$widgetType =
$this->context->get('widget_type_manager')->getWidgetType($widget['module'],
$widget['action']);
@@ -114,13 +114,13 @@
'widget_view.data' => $widget
));
- $html .= $this->context->get('widget_view')->renderForIndex();
+ $text .= $this->context->get('widget_view')->renderForIndex();
}
}
sfConfig::set('dm_search_populating', false);
- $indexableText = dmSearchIndex::cleanText($html);
+ $indexableText = dmSearchIndex::cleanText($text);
unset($areas, $html, $helper);
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextView.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextView.php
2010-01-24 12:25:40 UTC (rev 27119)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextView.php
2010-01-24 12:44:46 UTC (rev 27120)
@@ -46,32 +46,32 @@
$viewVars = $this->getViewVars();
extract($viewVars);
- $helper = $this->context->getHelper();
+ $helper = $this->getHelper();
$html = $helper->£o('div.dm_text.text_'.$style.'.clearfix');
if ($title && $titlePosition == 'outside')
{
- $html .= $helper->£('h2.text_title.outside', $titleLink ?
$this->context->getHelper()->£link($titleLink)->text($title) : $title);
+ $html .= $helper->£('h2.text_title.outside', $titleLink ?
$helper->£link($titleLink)->text($title) : $title);
}
$html .= $helper->£o('div.text_content');
if ($media && $mediaPosition != 'bottom')
{
- $html .= $helper->£('div.text_image'.$mediaClass, $mediaLink ?
$this->context->getHelper()->£link($mediaLink)->text($mediaTag) : $mediaTag);
+ $html .= $helper->£('div.text_image'.$mediaClass, $mediaLink ?
$helper->£link($mediaLink)->text($mediaTag) : $mediaTag);
}
if ($title && $titlePosition == 'inside')
{
- $html .= $helper->£('h2.text_title.inside', $titleLink ?
$this->context->getHelper()->£link($titleLink)->text($title) : $title);
+ $html .= $helper->£('h2.text_title.inside', $titleLink ?
$helper->£link($titleLink)->text($title) : $title);
}
$html .= $helper->£('div.markdown.text_markdown',
$this->context->get('markdown')->toHtml($text));
if ($media && $mediaPosition == 'bottom')
{
- $html .= $helper->£('div.text_image'.$mediaClass, $mediaLink ?
$this->context->getHelper()->£link($mediaLink)->text($mediaTag) : $mediaTag);
+ $html .= $helper->£('div.text_image'.$mediaClass, $mediaLink ?
$helper->£link($mediaLink)->text($mediaTag) : $mediaTag);
}
$html .= $helper->£c('div');
@@ -88,6 +88,12 @@
protected function doRenderForIndex()
{
- return implode(' ', array($this->compiledVars['title'],
$this->compiledVars['text'], $this->compiledVars['legend']));
+ $text = implode(' ', array(
+ $this->compiledVars['title'],
+ $this->compiledVars['text'],
+ $this->compiledVars['legend']
+ ));
+
+ return $text;
}
}
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
