AOEpeople / crawler

cli/class.tx_crawler_cli.php

Indentation +20 added lines, -20 removed lines

@@ -37,29 +37,29 @@
  */

 class tx_crawler_cli extends \TYPO3\CMS\Core\Controller\CommandLineController {

 

-	/**

-	 * Constructor

-	 *

-	 * @return	void

-	 */

-	function __construct() {

-		parent::__construct();

+    /**

+     * Constructor

+     *

+     * @return	void

+     */

+    function __construct() {

+        parent::__construct();

 

-		$this->cli_options[] = array('-h', 'Show the help', '');

-		$this->cli_options[] = array('--help', 'Same as -h', '');

-		$this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.');

-		$this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.');

-		$this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.');

+        $this->cli_options[] = array('-h', 'Show the help', '');

+        $this->cli_options[] = array('--help', 'Same as -h', '');

+        $this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.');

+        $this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.');

+        $this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.');

 

-		// Setting help texts:

-		$this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue';

-		$this->cli_help['synopsis'] = '###OPTIONS###';

-		$this->cli_help['description'] = "";

-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n";

-		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010';

-	}

+        // Setting help texts:

+        $this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue';

+        $this->cli_help['synopsis'] = '###OPTIONS###';

+        $this->cli_help['description'] = "";

+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n";

+        $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010';

+    }

 }

 

 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']) {

-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']);

+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']);

 }

cli/class.tx_crawler_cli_im.php

Indentation +30 added lines, -30 removed lines

@@ -37,41 +37,41 @@
  */

 class tx_crawler_cli_im extends \TYPO3\CMS\Core\Controller\CommandLineController {

 

-	/**

-	 * Constructor

-	 *

-	 * @return	void

-	 */

-	function __construct() {

-		parent::__construct();

+    /**

+     * Constructor

+     *

+     * @return	void

+     */

+    function __construct() {

+        parent::__construct();

 

-		// Adding options to help archive:

-		/**

-		* We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration

-		* this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs

-		* has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there).

-		* This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension.

-		*/

-		// $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).');

-		// TODO: cleanup here!

-		$this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");

-		$this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!");

-		$this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"');

-		$this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations');

-		#		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");

+        // Adding options to help archive:

+        /**

+         * We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration

+         * this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs

+         * has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there).

+         * This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension.

+         */

+        // $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).');

+        // TODO: cleanup here!

+        $this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");

+        $this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!");

+        $this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"');

+        $this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations');

+        #		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");

 

-		// Setting help texts:

-		$this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.';

-		$this->cli_help['synopsis'] = 'page_id ###OPTIONS###';

-		$this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line.";

-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n";

-		$this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

-		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';

-	}

+        // Setting help texts:

+        $this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.';

+        $this->cli_help['synopsis'] = 'page_id ###OPTIONS###';

+        $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line.";

+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n";

+        $this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

+        $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';

+    }

 }

 

 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']) {

-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']);

+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']);

 }

 

 ?>

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 		$this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");

 		$this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!");

 		$this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"');

-		$this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations');

+		$this->cli_options[] = array('-conf configurationkeys', 'List of Configuration Keys', 'A commaseperated list of crawler configurations');

 		#		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");

 

 		// Setting help texts:

@@ -65,7 +65,7 @@ 
 		$this->cli_help['synopsis'] = 'page_id ###OPTIONS###';

 		$this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line.";

 		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n";

-		$this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

+		$this->cli_help['examples'] .= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

 		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';

 	}

 }

cli/crawler_flush.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_cliMode'))	die('You cannot run this script directly!');
+if (!defined('TYPO3_cliMode')) {
+    die('You cannot run this script directly!');
+}
 
 $crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 $crawlerObj->CLI_main_flush($_SERVER["argv"]);

cli/bootstrap.php

Indentation +38 added lines, -38 removed lines

@@ -5,20 +5,20 @@ 
  * Retrieve path (taken from cli_dispatch.phpsh)
  */
 
-	// Get path to this script
+    // Get path to this script
 $tempPathThisScript = isset($_SERVER['argv'][0]) ? $_SERVER['argv'][0] : (isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_']);
 
-	// Resolve path
+    // Resolve path
 if (!isAbsPath($tempPathThisScript)) {
-	$workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
-	if ($workingDirectory) {
-		$tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
-		if (!@is_file($tempPathThisScript)) {
-			die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
-		}
-	} else {
-		die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
-	}
+    $workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
+    if ($workingDirectory) {
+        $tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
+        if (!@is_file($tempPathThisScript)) {
+            die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
+        }
+    } else {
+        die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
+    }
 }
 
 $typo3Root = preg_replace('#typo3conf/ext/crawler/cli/bootstrap.php$#', '', $tempPathThisScript);
@@ -30,33 +30,33 @@ 
  */
 $additionalHeaders = unserialize(base64_decode($_SERVER['argv'][3]));
 if (is_array($additionalHeaders)) {
-	foreach ($additionalHeaders as $additionalHeader) {
-		if (strpos($additionalHeader, ':') !== FALSE) {
-			list($key, $value) = explode(':', $additionalHeader, 2);
-			$key = str_replace('-', '_', strtoupper(trim($key)));
-			if ($key != 'HOST') {
-				$_SERVER['HTTP_' . $key] = $value;
-			}
-		}
-	}
+    foreach ($additionalHeaders as $additionalHeader) {
+        if (strpos($additionalHeader, ':') !== FALSE) {
+            list($key, $value) = explode(':', $additionalHeader, 2);
+            $key = str_replace('-', '_', strtoupper(trim($key)));
+            if ($key != 'HOST') {
+                $_SERVER['HTTP_' . $key] = $value;
+            }
+        }
+    }
 }
 
 
-	// put parsed query parts into $_GET array
+    // put parsed query parts into $_GET array
 $urlParts = parse_url($_SERVER['argv'][2]);
-	// Populating $_GET
+    // Populating $_GET
 parse_str($urlParts['query'], $_GET);
-	// Populating $_REQUEST
+    // Populating $_REQUEST
 parse_str($urlParts['query'], $_REQUEST);
-	// Populating $_POST
+    // Populating $_POST
 $_POST = array();
-	// Populating $_COOKIE
+    // Populating $_COOKIE
 $_COOKIE = array();
 
-	// Get the TYPO3_SITE_PATH of the website frontend:
+    // Get the TYPO3_SITE_PATH of the website frontend:
 $typo3SitePath = $_SERVER['argv'][1];
 
-	// faking the environment
+    // faking the environment
 $_SERVER['DOCUMENT_ROOT'] = preg_replace('#' . preg_quote($typo3SitePath, '#') . '$#', '', $typo3Root);
 $_SERVER['HTTP_USER_AGENT'] = 'CLI Mode';
 $_SERVER['HTTP_HOST'] = $_SERVER['SERVER_NAME'] = $urlParts['host'];
@@ -66,15 +66,15 @@ 
 $_SERVER['REQUEST_URI'] = $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '');
 $_SERVER['REQUEST_METHOD'] = 'GET';
 
-	// Define a port if used in the URL:
+    // Define a port if used in the URL:
 if (isset($urlParts['port'])) {
-	$_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
-	$_SERVER['SERVER_PORT'] = $urlParts['port'];
+    $_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
+    $_SERVER['SERVER_PORT'] = $urlParts['port'];
 }
 
-	// Define HTTPS disposal:
+    // Define HTTPS disposal:
 if ($urlParts['scheme'] === 'https') {
-	$_SERVER['HTTPS'] = 'on';
+    $_SERVER['HTTPS'] = 'on';
 }
 
 chdir($typo3Root);
@@ -88,11 +88,11 @@ 
  * @return boolean
  */
 function isAbsPath($path) {
-		// on Windows also a path starting with a drive letter is absolute: X:/
-	if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') {
-		return TRUE;
-	}
+        // on Windows also a path starting with a drive letter is absolute: X:/
+    if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') {
+        return TRUE;
+    }
 
-		// path starting with a / is always absolute, on every system
-	return (substr($path, 0, 1) === '/');
+        // path starting with a / is always absolute, on every system
+    return (substr($path, 0, 1) === '/');
 }

Spacing +10 added lines, -10 removed lines

@@ -12,12 +12,12 @@ 
 if (!isAbsPath($tempPathThisScript)) {
 	$workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
 	if ($workingDirectory) {
-		$tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
+		$tempPathThisScript = $workingDirectory.'/'.preg_replace('/\.\//', '', $tempPathThisScript);
 		if (!@is_file($tempPathThisScript)) {
-			die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
+			die('Relative path found, but an error occured during resolving of the absolute path: '.$tempPathThisScript.PHP_EOL);
 		}
 	} else {
-		die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
+		die('Relative path found, but resolving absolute path is not supported on this platform.'.PHP_EOL);
 	}
 }
 
@@ -35,7 +35,7 @@ 
 			list($key, $value) = explode(':', $additionalHeader, 2);
 			$key = str_replace('-', '_', strtoupper(trim($key)));
 			if ($key != 'HOST') {
-				$_SERVER['HTTP_' . $key] = $value;
+				$_SERVER['HTTP_'.$key] = $value;
 			}
 		}
 	}
@@ -57,18 +57,18 @@ 
 $typo3SitePath = $_SERVER['argv'][1];
 
 	// faking the environment
-$_SERVER['DOCUMENT_ROOT'] = preg_replace('#' . preg_quote($typo3SitePath, '#') . '$#', '', $typo3Root);
+$_SERVER['DOCUMENT_ROOT'] = preg_replace('#'.preg_quote($typo3SitePath, '#').'$#', '', $typo3Root);
 $_SERVER['HTTP_USER_AGENT'] = 'CLI Mode';
 $_SERVER['HTTP_HOST'] = $_SERVER['SERVER_NAME'] = $urlParts['host'];
-$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $typo3SitePath . 'index.php';
-$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'] = $typo3Root . 'index.php';
+$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $typo3SitePath.'index.php';
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'] = $typo3Root.'index.php';
 $_SERVER['QUERY_STRING'] = (isset($urlParts['query']) ? $urlParts['query'] : '');
-$_SERVER['REQUEST_URI'] = $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '');
+$_SERVER['REQUEST_URI'] = $urlParts['path'].(isset($urlParts['query']) ? '?'.$urlParts['query'] : '');
 $_SERVER['REQUEST_METHOD'] = 'GET';
 
 	// Define a port if used in the URL:
 if (isset($urlParts['port'])) {
-	$_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
+	$_SERVER['HTTP_HOST'] .= ':'.$urlParts['port'];
 	$_SERVER['SERVER_PORT'] = $urlParts['port'];
 }
 
@@ -78,7 +78,7 @@ 
 }
 
 chdir($typo3Root);
-include($typo3Root . '/index.php');
+include($typo3Root.'/index.php');
 
 
 /**

cli/class.tx_crawler_cli_flush.php

Indentation +19 added lines, -19 removed lines

@@ -37,30 +37,30 @@
  */
 class tx_crawler_cli_flush extends \TYPO3\CMS\Core\Controller\CommandLineController {
 
-	/**
-	 * Constructor
-	 *
-	 * @return	void
-	 */
-	function __construct() {
-		parent::__construct();
+    /**
+     * Constructor
+     *
+     * @return	void
+     */
+    function __construct() {
+        parent::__construct();
 
-			// Adding options to help archive:
-		$this->cli_options[] = array('-o mode', 'Output mode: "finished", "all", "pending"', "Specifies the type queue entries which is flushed in the process.");
-		#		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");
+            // Adding options to help archive:
+        $this->cli_options[] = array('-o mode', 'Output mode: "finished", "all", "pending"', "Specifies the type queue entries which is flushed in the process.");
+        #		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");
 
-			// Setting help texts:
-		$this->cli_help['name'] = 'crawler CLI interface -- Cleaning up the queue.';
-		$this->cli_help['synopsis'] = 'page_id ###OPTIONS###';
-		$this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It will remove queue entires and perform a cleanup.";
-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 5 -o=finished\nWill remove all finished queue-entries in the sub-branch of page 5\n";
-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 0 -o=all\nWill remove all queue-entries for every page\n";
-		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';
-	}
+            // Setting help texts:
+        $this->cli_help['name'] = 'crawler CLI interface -- Cleaning up the queue.';
+        $this->cli_help['synopsis'] = 'page_id ###OPTIONS###';
+        $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It will remove queue entires and perform a cleanup.";
+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 5 -o=finished\nWill remove all finished queue-entries in the sub-branch of page 5\n";
+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 0 -o=all\nWill remove all queue-entries for every page\n";
+        $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';
+    }
 }
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']) {
-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']);
+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']);
 }
 
 ?>

domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php

Indentation +33 added lines, -33 removed lines

@@ -24,43 +24,43 @@
 
 abstract class tx_crawler_domain_lib_abstract_dbobject {
 
-	/**
-	 * @var array
-	 */
-	protected $row;
+    /**
+     * @var array
+     */
+    protected $row;
 
-	/**
-	 * @var string table name
-	 */
-	protected static $tableName;
+    /**
+     * @var string table name
+     */
+    protected static $tableName;
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $row optional array with propertys
-	 */
-	public function __construct($row = array()) {
-		$this->row = $row;
-	}
+    /**
+     * Constructor
+     *
+     * @param array $row optional array with propertys
+     */
+    public function __construct($row = array()) {
+        $this->row = $row;
+    }
 
-	/**
-	 * Get table name
-	 *
-	 * @param void
-	 * @return string table name
-	 */
-	public static function getTableName(){
-		return self::$tableName;
-	}
+    /**
+     * Get table name
+     *
+     * @param void
+     * @return string table name
+     */
+    public static function getTableName(){
+        return self::$tableName;
+    }
 
-	/**
-	 * Returns the propertys of the object as array
-	 *
-	 * @return array
-	 */
-	public function getRow() {
-		return $this->row;
-	}
+    /**
+     * Returns the propertys of the object as array
+     *
+     * @return array
+     */
+    public function getRow() {
+        return $this->row;
+    }
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 * @param void
 	 * @return string table name
 	 */
-	public static function getTableName(){
+	public static function getTableName() {
 		return self::$tableName;
 	}
 

domain/queue/class.tx_crawler_domain_queue_entry.php

Indentation +12 added lines, -12 removed lines

@@ -24,19 +24,19 @@
 
 class tx_crawler_domain_queue_entry extends tx_crawler_domain_lib_abstract_dbobject {
 
-	/**
-	 * @var string table name
-	 */
-	protected static $tableName = 'tx_crawler_queue';
+    /**
+     * @var string table name
+     */
+    protected static $tableName = 'tx_crawler_queue';
 
-	/**
-	 * Returns the execution time of the record as int value
-	 *
-	 * @return int
-	 */
-	public function getExecutionTime(){
-		return $this->row['exec_time'];
-	}
+    /**
+     * Returns the execution time of the record as int value
+     *
+     * @return int
+     */
+    public function getExecutionTime(){
+        return $this->row['exec_time'];
+    }
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 *
 	 * @return int
 	 */
-	public function getExecutionTime(){
+	public function getExecutionTime() {
 		return $this->row['exec_time'];
 	}
 

domain/queue/class.tx_crawler_domain_queue_repository.php

Indentation +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     {
         $db      = $this->getDB();
         $where   = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
-                   ' AND exec_time > 0 ';
+                    ' AND exec_time > 0 ';
         $limit   = 1;
         $groupby = '';
 

Spacing +10 added lines, -10 removed lines

@@ -68,7 +68,7 @@ 
     protected function getFirstOrLastObjectByProcess($process, $orderby)
     {
         $db      = $this->getDB();
-        $where   = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
+        $where   = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(), $this->tableName).
                    ' AND exec_time > 0 ';
         $limit   = 1;
         $groupby = '';
@@ -93,7 +93,7 @@ 
      */
     public function countExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = ' . $this->getDB()->fullQuoteStr($process->getProcess_id(),
+        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),
                 $this->tableName));
     }
 
@@ -106,7 +106,7 @@ 
      */
     public function countNonExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = ' . $this->getDB()->fullQuoteStr($process->getProcess_id(),
+        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),
                 $this->tableName));
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function countAllPendingItems()
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < ' . time());
+        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function countAllAssignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id != ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
     }
 
     /**
@@ -146,7 +146,7 @@ 
      */
     public function countAllUnassignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id = ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
     }
 
     /**
@@ -176,7 +176,7 @@ 
         $res  = $db->exec_SELECTquery(
             "configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'configuration'
         );
         $rows = array();
@@ -200,7 +200,7 @@ 
         $res    = $db->exec_SELECTquery(
             'set_id',
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'set_id'
         );
         $setIds = array();
@@ -226,7 +226,7 @@ 
             $res = $db->exec_SELECTquery(
                 'configuration, count(*) as c',
                 $this->tableName,
-                'set_id in (' . implode(',', $setIds) . ') AND scheduled < ' . time(),
+                'set_id in ('.implode(',', $setIds).') AND scheduled < '.time(),
                 'configuration'
             );
             while ($row = $db->sql_fetch_assoc($res)) {
@@ -306,7 +306,7 @@ 
         $res = $db->exec_SELECTquery(
             'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount',
             $this->tableName,
-            'exec_time != 0 and exec_time >= ' . intval($start) . ' and exec_time <= ' . intval($end),
+            'exec_time != 0 and exec_time >= '.intval($start).' and exec_time <= '.intval($end),
             'process_id_completed'
         );
 

domain/reason/class.tx_crawler_domain_reason.php

Indentation +75 added lines, -75 removed lines

@@ -24,90 +24,90 @@
 
 class tx_crawler_domain_reason extends tx_crawler_domain_lib_abstract_dbobject {
 
-	protected static $tableName = 'tx_crawler_reason';
+    protected static $tableName = 'tx_crawler_reason';
 
-	/**
-	 * THE CONSTANTS REPRESENT THE KIND OF THE REASON
-	 *
-	 * Convention for own states: <extensionkey>_<reason>
-	 */
-	const REASON_DEFAULT = 'crawler_default_reason';
-	const REASON_GUI_SUBMIT = 'crawler_gui_submit_reason';
-	const REASON_CLI_SUBMIT = 'crawler_cli_submit_reason';
+    /**
+     * THE CONSTANTS REPRESENT THE KIND OF THE REASON
+     *
+     * Convention for own states: <extensionkey>_<reason>
+     */
+    const REASON_DEFAULT = 'crawler_default_reason';
+    const REASON_GUI_SUBMIT = 'crawler_gui_submit_reason';
+    const REASON_CLI_SUBMIT = 'crawler_cli_submit_reason';
 
-	/**
-	 * Set uid
-	 *
-	 * @param int uid
-	 * @return void
-	 */
-	public function setUid($uid) {
-		$this->row['uid'] = $uid;
-	}
+    /**
+     * Set uid
+     *
+     * @param int uid
+     * @return void
+     */
+    public function setUid($uid) {
+        $this->row['uid'] = $uid;
+    }
 
-	/**
-	 * Method to set a timestamp for the creation time of this record
-	 *
-	 * @param int $time
-	 */
-	public function setCreationDate($time) {
-		$this->row['crdate'] = $time;
-	}
+    /**
+     * Method to set a timestamp for the creation time of this record
+     *
+     * @param int $time
+     */
+    public function setCreationDate($time) {
+        $this->row['crdate'] = $time;
+    }
 
-	/**
-	 * This method can be used to set a user id of the user who has created this reason entry
-	 *
-	 * @param int $user_id
-	 */
-	public function setBackendUserId($user_id) {
-		$this->row['cruser_id'] = $user_id;
-	}
+    /**
+     * This method can be used to set a user id of the user who has created this reason entry
+     *
+     * @param int $user_id
+     */
+    public function setBackendUserId($user_id) {
+        $this->row['cruser_id'] = $user_id;
+    }
 
-	/**
-	 * Method to set the type of the reason for this reason instance (see constances)
-	 *
-	 * @param string $string
-	 */
-	public function setReason($string) {
-		$this->row['reason'] = $string;
-	}
+    /**
+     * Method to set the type of the reason for this reason instance (see constances)
+     *
+     * @param string $string
+     */
+    public function setReason($string) {
+        $this->row['reason'] = $string;
+    }
 
-	/**
-	 * This method returns the attached reason text.
-	 * @return string
-	 */
-	public function getReason() {
-		return $this->row['reason'];
-	}
+    /**
+     * This method returns the attached reason text.
+     * @return string
+     */
+    public function getReason() {
+        return $this->row['reason'];
+    }
 
-	/**
-	 * This method can be used to assign a detail text to the crawler reason
-	 *
-	 * @param string $detail_text
-	 */
-	public function setDetailText($detail_text) {
-		$this->row['detail_text'] = $detail_text;
-	}
+    /**
+     * This method can be used to assign a detail text to the crawler reason
+     *
+     * @param string $detail_text
+     */
+    public function setDetailText($detail_text) {
+        $this->row['detail_text'] = $detail_text;
+    }
 
-	/**
-	 * Returns the attachet detail text.
-	 *
-	 * @param void
-	 * @return string
-	 */
-	public function getDetailText() {
-		return $this->row['detail_text'];
-	}
+    /**
+     * Returns the attachet detail text.
+     *
+     * @param void
+     * @return string
+     */
+    public function getDetailText() {
+        return $this->row['detail_text'];
+    }
 
-	/**
-	 * This method is used to set the uid of the queue entry
-	 * where the reason is relevant for.
-	 *
-	 * @param int $entry_uid
-	 */
-	public function setQueueEntryUid($entry_uid) {
-		$this->row['queue_entry_uid'] = $entry_uid;
-	}
+    /**
+     * This method is used to set the uid of the queue entry
+     * where the reason is relevant for.
+     *
+     * @param int $entry_uid
+     */
+    public function setQueueEntryUid($entry_uid) {
+        $this->row['queue_entry_uid'] = $entry_uid;
+    }
 
 }