Author: mj
Date: Mon Oct 24 14:09:28 2011
New Revision: 10176
Log:
Add creatorhistory (admin/biographical) to search index and advanced search
fields. Closes #2118.
Modified:
trunk/apps/qubit/modules/search/templates/_box.php
trunk/apps/qubit/modules/search/templates/_searchFields.php
trunk/lib/QubitSearch.class.php
trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
trunk/qubit_dev.php
Modified: trunk/apps/qubit/modules/search/templates/_box.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_box.php Mon Oct 24 14:05:52
2011 (r10175)
+++ trunk/apps/qubit/modules/search/templates/_box.php Mon Oct 24 14:09:28
2011 (r10176)
@@ -4,7 +4,8 @@
<div class="content">
<div class="advanced-search">
- <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced')) ?>
+ <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced'),
+ array('query_string' => (isset($sf_request->query)) ?
'searchFields[0][field]=&searchFields[0][match]=keyword&searchFields[0][operator]=and&searchFields[0][query]='
. $sf_request->query : null)) ?>
</div>
<form action="<?php echo url_for(array('module' => 'search')) ?>">
<input name="query"<?php if (isset($sf_request->query)) echo '
class="focused"' ?> value="<?php echo esc_entities($sf_request->query) ?>"/>
Modified: trunk/apps/qubit/modules/search/templates/_searchFields.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_searchFields.php Mon Oct 24
14:05:52 2011 (r10175)
+++ trunk/apps/qubit/modules/search/templates/_searchFields.php Mon Oct 24
14:09:28 2011 (r10176)
@@ -18,6 +18,7 @@
<select style="width: 90%;" name="searchFields[<?php echo $key
?>][field]">
<option value=""<?php echo $item['field'] == '' ? '
selected="selected"' : '' ?>><?php echo __('Any field') ?></option>
<option value="title"<?php echo $item['field'] == 'title' ? '
selected="selected"' : '' ?>><?php echo __('Title') ?></option>
+ <option value="creatorhistory"<?php echo $item['field'] ==
'creatorhistory' ? ' selected="selected"' : '' ?>><?php echo
__('Admin/biographical history') ?></option>
<option value="archivalhistory"<?php echo $item['field'] ==
'archivalhistory' ? ' selected="selected"' : '' ?>><?php echo __('Archival
history') ?></option>
<option value="scopeAndContent"<?php echo $item['field'] ==
'scopeAndContent' ? ' selected="selected"' : '' ?>><?php echo __('Scope and
content') ?></option>
<option value="extentandmedium"<?php echo $item['field'] ==
'extentandmedium' ? ' selected="selected"' : '' ?>><?php echo __('Extent and
medium') ?></option>
@@ -54,6 +55,7 @@
<select style="width: 90%;" name="searchFields[<?php echo $count
?>][field]">
<option value=""><?php echo __('Any field') ?></option>
<option value="title"><?php echo __('Title') ?></option>
+ <option value="creatorhistory"><?php echo __('Admin/biographical
history') ?></option>
<option value="archivalhistory"><?php echo __('Archival history')
?></option>
<option value="scopeAndContent"><?php echo __('Scope and content')
?></option>
<option value="extentandmedium"><?php echo __('Extent and medium')
?></option>
Modified: trunk/lib/QubitSearch.class.php
==============================================================================
--- trunk/lib/QubitSearch.class.php Mon Oct 24 14:05:52 2011 (r10175)
+++ trunk/lib/QubitSearch.class.php Mon Oct 24 14:09:28 2011 (r10176)
@@ -482,14 +482,9 @@
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('dates',
serialize($dates)));
- /*
// CREATOR
- $creatorField = Zend_Search_Lucene_Field::Unstored('creator',
$informationObject->getCreatorsNameString(array('culture' => $language)));
- // Boost the hit relevance for the creator field
- $creatorField->boost = 8;
- $doc->addField($creatorField);
+ $doc->addField(Zend_Search_Lucene_Field::Unstored('creator',
$informationObject->getCreatorsNameString(array('culture' => $language))));
$doc->addField(Zend_Search_Lucene_Field::Unstored('creatorhistory',
$informationObject->getCreatorsHistoryString(array('culture' => $language))));
- */
// Level of Description
if (null !== $informationObject->getLevelOfDescription())
Modified: trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php Mon Oct
24 14:05:52 2011 (r10175)
+++ trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php Mon Oct
24 14:09:28 2011 (r10176)
@@ -8,7 +8,7 @@
<input class="form-submit" type="submit" value="<?php echo __('Search')
?>"/>
<div class="advanced-search">
<?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced'),
- array('query_string' => (isset($sf_request->query))
? 'searchFields[0][query]=' . $sf_request->query : null)) ?>
+ array('query_string' => (isset($sf_request->query))
?
'searchFields[0][field]=&searchFields[0][match]=keyword&searchFields[0][operator]=and&searchFields[0][query]='
. $sf_request->query : null)) ?>
</div>
</form>
</div>
Modified: trunk/qubit_dev.php
==============================================================================
--- trunk/qubit_dev.php Mon Oct 24 14:05:52 2011 (r10175)
+++ trunk/qubit_dev.php Mon Oct 24 14:09:28 2011 (r10176)
@@ -4,7 +4,7 @@
// feel free to remove this, extend it or make something more sophisticated.
if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1')))
{
- die('You are not allowed to access this file. Check '.basename(__FILE__).'
for more information.');
+// die('You are not allowed to access this file. Check '.basename(__FILE__).'
for more information.');
}
require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php');
--
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.
