Author: jablko
Date: Thu Sep 24 16:41:16 2009
New Revision: 3525
Log:
Drop search index check, not needed since revision 2860 -- force
Deleted:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/checkSearchIndexAction.class.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSearchIndexSuccess.php
Modified:
trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
Modified: trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php
==============================================================================
--- trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php Thu Sep 24
16:33:02 2009 (r3524)
+++ trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php Thu Sep 24
16:41:16 2009 (r3525)
@@ -374,59 +374,6 @@
return $settingsYml;
}
- // TODO: Move to sfSearchPlugin
- protected static function getSearchIndexes()
- {
- $searchIndexes = array();
-
- $finder = sfFinder::type('file')->name('*.class.php');
-
- foreach ($finder->in(sfConfig::get('sf_lib_dir').'/search') as $path)
- {
- require_once $path;
- }
-
- // Copied from sfCommandApplication::registerTasks()
- foreach (get_declared_classes() as $className)
- {
- $class = new ReflectionClass($className);
- if ($class->isSubclassOf('xfIndexSingle'))
- {
- $searchIndex = new $className;
- $searchIndexes[$searchIndex->getName()] = $searchIndex;
- }
- }
-
- return $searchIndexes;
- }
-
- // TODO: Break this up so we can send status to the user immediately
- public static function checkSearchIndex()
- {
- $searchIndex = array();
-
- $dispatcher = sfContext::getInstance()->getEventDispatcher();
- $formatter = new sfAnsiColorFormatter;
-
- chdir(sfConfig::get('sf_root_dir'));
-
- foreach (self::getSearchIndexes() as $index)
- {
- $populate = new xfPopulateTask($dispatcher, $formatter);
-
- try
- {
- $populate->run(array($index->getName()));
- }
- catch (Exception $e)
- {
- $searchIndex[] = $e;
- }
- }
-
- return $searchIndex;
- }
-
/**
* Check that memory_limit ini value meets Qubit's minimum requirements
* (currently 64 MB)
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
Thu Sep 24 16:33:02 2009 (r3524)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
Thu Sep 24 16:41:16 2009 (r3525)
@@ -5,7 +5,6 @@
<div id="progress" />
<?php use_javascript('/sfDrupalPlugin/vendor/drupal/misc/progress') ?>
<?php $checkHtaccessUrl = json_encode(url_for(array('module' =>
'sfInstallPlugin', 'action' => 'checkHtaccess'))) ?>
-<?php $checkSearchIndexUrl = json_encode(url_for(array('module' =>
'sfInstallPlugin', 'action' => 'checkSearchIndex'))) ?>
<?php echo javascript_tag(<<<EOF
progress = new Drupal.progressBar('checkSystem');
progress.setProgress(-1, 'Check system');
@@ -16,14 +15,7 @@
complete: function (request)
{
$('#progress').after(request.responseText);
- progress.setProgress(50, 'Check search index');
- jQuery.ajax({
- url: $checkSearchIndexUrl,
- complete: function (request)
- {
- $('#progress').after(request.responseText);
- progress.setProgress(100, 'Check system');
- } });
+ progress.setProgress(100, 'Check system');
} });
EOF
) ?>
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
