Merge lp:~tristan-rivoallan/vanilla-miner/vm-600135 into lp:vanilla-miner

[Tristan Rivoallan]

[Tristan Rivoallan (tristan-rivoallan)]

review: Approve

=== modified file 'lib/task/minerExtractlinksTask.class.php'
--- lib/task/minerExtractlinksTask.class.php	2010-06-29 17:28:46 +0000
+++ lib/task/minerExtractlinksTask.class.php	2010-06-30 17:23:24 +0000
@@ -29,6 +29,7 @@
         new sfCommandOption('extraction-driver', null, sfCommandOption::PARAMETER_REQUIRED, 'Extraction driver class name', 'CI_Extractor_LussumoVanilla1'),
         new sfCommandOption('incremental', null, sfCommandOption::PARAMETER_REQUIRED, 'If true, only extracts URLs from new and updated resources since last extraction', true),
         new sfCommandOption('progress', null, sfCommandOption::PARAMETER_NONE, 'Displays a progress bar'),
+        new sfCommandOption('and-expand', null, sfCommandOption::PARAMETER_NONE, 'Launches expansion on newly extracted links'),
         ));
 
         $this->namespace        = 'miner';
@@ -148,6 +149,12 @@
             $this->logSection('extract', 'No resources to extract. Exiting.');
         }
 
+        // Run links expansion if user asked so
+        if ($options['and-expand'])
+        {
+            $this->runTask('miner:expand-links', array(), array('progress' => $options['progress']));
+        }
+
         // Record finish time and statistics
         $databaseManager = new sfDatabaseManager($this->configuration);
         $connection = $databaseManager->getDatabase($options['connection'])->getConnection();