jenskooij / cloudcontrol

src/components/DocumentComponent.php

Indentation +112 added lines, -112 removed lines

@@ -4,128 +4,128 @@
     use storage\Storage;
 
     /**
-	 * Class DocumentComponent
-	 *
-	 * Has optional parameter `folder` to prefix the relative url with a folder
-	 * Has optional parameter `document` to select a given document
-	 * Has optional parameter `documentParameterName` to select the parametername to be used
-	 * 		to set the found document to.
-	 *
-	 * @package CloudControl\Cms\components
-	 */
-	class DocumentComponent extends BaseComponent
-	{
-		protected $documentParameterName = 'document';
+     * Class DocumentComponent
+     *
+     * Has optional parameter `folder` to prefix the relative url with a folder
+     * Has optional parameter `document` to select a given document
+     * Has optional parameter `documentParameterName` to select the parametername to be used
+     * 		to set the found document to.
+     *
+     * @package CloudControl\Cms\components
+     */
+    class DocumentComponent extends BaseComponent
+    {
+        protected $documentParameterName = 'document';
 
-		/**
-		 * @param Storage $storage
-		 *
-		 * @return mixed|void
-		 * @throws \Exception
-		 */
-		public function run(Storage $storage)
-		{
-			parent::run($storage);
+        /**
+         * @param Storage $storage
+         *
+         * @return mixed|void
+         * @throws \Exception
+         */
+        public function run(Storage $storage)
+        {
+            parent::run($storage);
 
-			$this->checkParameters();
+            $this->checkParameters();
 
-			if ($this->matchedSitemapItem === null) { // If no sitemapitem, its an application component
-				$this->runLikeApplicationComponent();
-			} else {
-				$this->runLikeRegularComponent();
-			}
-		}
+            if ($this->matchedSitemapItem === null) { // If no sitemapitem, its an application component
+                $this->runLikeApplicationComponent();
+            } else {
+                $this->runLikeRegularComponent();
+            }
+        }
 
-		/**
-		 * Checks to see if any parameters were defined in the cms and acts according
-		 */
-		private function checkParameters()
-		{
-			if (isset($this->parameters['documentParameterName'])) {
-				$this->documentParameterName = $this->parameters['documentParameterName'];
-			}
-		}
+        /**
+         * Checks to see if any parameters were defined in the cms and acts according
+         */
+        private function checkParameters()
+        {
+            if (isset($this->parameters['documentParameterName'])) {
+                $this->documentParameterName = $this->parameters['documentParameterName'];
+            }
+        }
 
-		/**
-		 * Run as application component
-		 *
-		 * @throws \Exception
-		 */
-		private function runLikeApplicationComponent()
-		{
-			if (isset($this->parameters['document'])) {
-				$this->parameters[$this->documentParameterName] = $this->storage->getDocuments()->getDocumentBySlug($this->parameters['document']);
-				unset($this->parameters['document']);
-			} else {
-				throw new \Exception('When used as application component, you need to specify a document.');
-			}
-		}
+        /**
+         * Run as application component
+         *
+         * @throws \Exception
+         */
+        private function runLikeApplicationComponent()
+        {
+            if (isset($this->parameters['document'])) {
+                $this->parameters[$this->documentParameterName] = $this->storage->getDocuments()->getDocumentBySlug($this->parameters['document']);
+                unset($this->parameters['document']);
+            } else {
+                throw new \Exception('When used as application component, you need to specify a document.');
+            }
+        }
 
-		/**
-		 * Run as regular component
-		 *
-		 * @throws \Exception
-		 */
-		private function runLikeRegularComponent()
-		{
-			if ($this->matchedSitemapItem->regex == false) {
-				$this->runWithoutRegex();
-			} else {
-				$this->runWithRegex();
-			}
-		}
+        /**
+         * Run as regular component
+         *
+         * @throws \Exception
+         */
+        private function runLikeRegularComponent()
+        {
+            if ($this->matchedSitemapItem->regex == false) {
+                $this->runWithoutRegex();
+            } else {
+                $this->runWithRegex();
+            }
+        }
 
-		/**
-		 * Run without regex
-		 *
-		 * @throws \Exception
-		 */
-		private function runWithoutRegex()
-		{
-			if (isset($this->parameters['document'])) {
-				$this->runByDocumentParameter();
-			} else {
-				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
-			}
-		}
+        /**
+         * Run without regex
+         *
+         * @throws \Exception
+         */
+        private function runWithoutRegex()
+        {
+            if (isset($this->parameters['document'])) {
+                $this->runByDocumentParameter();
+            } else {
+                throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+            }
+        }
 
-		/**
-		 * Run with regex
-		 *
-		 * @throws \Exception
-		 */
-		private function runWithRegex()
-		{
-			if (isset($this->parameters['document'])) {
-				$this->runByDocumentParameter();
-			} else {
-				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
-				if (isset($this->parameters['folder'])) {
-					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
-					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
-				}
+        /**
+         * Run with regex
+         *
+         * @throws \Exception
+         */
+        private function runWithRegex()
+        {
+            if (isset($this->parameters['document'])) {
+                $this->runByDocumentParameter();
+            } else {
+                $relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
+                if (isset($this->parameters['folder'])) {
+                    if (substr($this->parameters['folder'], -1) !== '/') {
+                        $this->parameters['folder'] = $this->parameters['folder'] . '/';
+                    }
+                    $relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+                }
 
-				$document = $this->storage->getDocuments()->getDocumentBySlug($relativeDocumentUri);
+                $document = $this->storage->getDocuments()->getDocumentBySlug($relativeDocumentUri);
 
-				if ($document->type == 'folder') {
-					throw new \Exception('The found document is a folder.');
-				}
+                if ($document->type == 'folder') {
+                    throw new \Exception('The found document is a folder.');
+                }
 
-				if ($document->state != 'published') {
-					throw new \Exception('Found document is unpublished.');
-				}
-				$this->parameters[$this->documentParameterName] = $document;
-			}
-		}
+                if ($document->state != 'published') {
+                    throw new \Exception('Found document is unpublished.');
+                }
+                $this->parameters[$this->documentParameterName] = $document;
+            }
+        }
 
-		/**
-		 * Run using the given `document` parameter
-		 */
-		private function runByDocumentParameter()
-		{
-			$this->parameters[$this->documentParameterName] = $this->storage->getDocuments()->getDocumentBySlug($this->parameters['document']);
-		}
-	}
+        /**
+         * Run using the given `document` parameter
+         */
+        private function runByDocumentParameter()
+        {
+            $this->parameters[$this->documentParameterName] = $this->storage->getDocuments()->getDocumentBySlug($this->parameters['document']);
+        }
+    }
 }
\ No newline at end of file

src/components/Component.php

Indentation +31 added lines, -31 removed lines

@@ -6,39 +6,39 @@
     use CloudControl\Cms\storage\Storage;
 
     /**
-	 * Interface Component
-	 * @package CloudControl\Cms\components
-	 */
-	interface Component
-	{
-		/**
-		 * Component constructor.
-		 *
-		 * @param                     $template
-		 * @param Request $request
-		 * @param                     $parameters
-		 * @param                     $matchedSitemapItem
-		 */
-		function __construct($template, Request $request, $parameters, $matchedSitemapItem);
+     * Interface Component
+     * @package CloudControl\Cms\components
+     */
+    interface Component
+    {
+        /**
+         * Component constructor.
+         *
+         * @param                     $template
+         * @param Request $request
+         * @param                     $parameters
+         * @param                     $matchedSitemapItem
+         */
+        function __construct($template, Request $request, $parameters, $matchedSitemapItem);
 
-		/**
-		 * @param Storage $storage
-		 */
-		function run(Storage $storage);
+        /**
+         * @param Storage $storage
+         */
+        function run(Storage $storage);
 
-		/**
-		 * @return void
-		 */
-		function render();
+        /**
+         * @return void
+         */
+        function render();
 
-		/**
-		 * @return mixed
-		 */
-		function get();
+        /**
+         * @return mixed
+         */
+        function get();
 
-		/**
-		 * @return \stdClass
-		 */
-		function getParameters();
-	}
+        /**
+         * @return \stdClass
+         */
+        function getParameters();
+    }
 }
\ No newline at end of file

src/crypt/Crypt.php

Indentation +112 added lines, -112 removed lines

@@ -1,129 +1,129 @@
 <?php
 namespace CloudControl\Cms\crypt
 {
-	/**
-	 * Class Crypt
-	 * @package CloudControl\Cms\crypt
-	 */
-	class Crypt
-	{
-		/**
-		 * @var string
-		 */
-		private $lastSalt;
+    /**
+     * Class Crypt
+     * @package CloudControl\Cms\crypt
+     */
+    class Crypt
+    {
+        /**
+         * @var string
+         */
+        private $lastSalt;
 		
-		/**
-		 * Encrypts the given value using the blowfish algorithm
-		 *
-		 * @param  string  	$value 					The sting to be encrypted
-		 * @param  int 	  	$encryptionIterations 	The amount of iterations used for encryption, 13 by default, resulting in aprox. 0.5 seconds of encrypting. Each raise, will result in about double the time
-		 * @return string 	The hash
-		 */
-		public function encrypt($value, $encryptionIterations = 13)
-		{
-			$random = $this->getRandomBytes(16);
-			$this->lastSalt = $this->getSalt($random, $encryptionIterations);
-			$hash = crypt($value, $this->lastSalt);
-			return $hash;
-		}
+        /**
+         * Encrypts the given value using the blowfish algorithm
+         *
+         * @param  string  	$value 					The sting to be encrypted
+         * @param  int 	  	$encryptionIterations 	The amount of iterations used for encryption, 13 by default, resulting in aprox. 0.5 seconds of encrypting. Each raise, will result in about double the time
+         * @return string 	The hash
+         */
+        public function encrypt($value, $encryptionIterations = 13)
+        {
+            $random = $this->getRandomBytes(16);
+            $this->lastSalt = $this->getSalt($random, $encryptionIterations);
+            $hash = crypt($value, $this->lastSalt);
+            return $hash;
+        }
 		
-		/**
-		 * If on Linux, tries to use built in random byte feed
-		 * else generates its own feed
-		 *
-		 * @param  int 		$count 		The amount of bytes to generates
-		 * @return string 	The bytes
-		 */
-		private function getRandomBytes($count)
-		{
-			$output = '';
-			$random_state = microtime();
+        /**
+         * If on Linux, tries to use built in random byte feed
+         * else generates its own feed
+         *
+         * @param  int 		$count 		The amount of bytes to generates
+         * @return string 	The bytes
+         */
+        private function getRandomBytes($count)
+        {
+            $output = '';
+            $random_state = microtime();
 
-			$openBasedir = ini_get('open_basedir');
-			if (empty($openBasedir) &&
-				is_readable('/dev/urandom') &&
-				($fh = @fopen('/dev/urandom', 'rb'))) {
-				$output = fread($fh, $count);
-				fclose($fh);
-			}
+            $openBasedir = ini_get('open_basedir');
+            if (empty($openBasedir) &&
+                is_readable('/dev/urandom') &&
+                ($fh = @fopen('/dev/urandom', 'rb'))) {
+                $output = fread($fh, $count);
+                fclose($fh);
+            }
 
-			if (strlen($output) < $count) {
-				$output = '';
-				for ($i = 0; $i < $count; $i += 16) {
-					$random_state =
-						md5(microtime() . $random_state);
-					$output .=
-						pack('H*', md5($random_state));
-				}
-				$output = substr($output, 0, $count);
-			}
+            if (strlen($output) < $count) {
+                $output = '';
+                for ($i = 0; $i < $count; $i += 16) {
+                    $random_state =
+                        md5(microtime() . $random_state);
+                    $output .=
+                        pack('H*', md5($random_state));
+                }
+                $output = substr($output, 0, $count);
+            }
 			
-			return $output;
-		}
+            return $output;
+        }
 
-		/**
-		 * Generates the salt used for encryption
-		 *
-		 * @param string $input      Feed for iteration
-		 * @param int    $iterations Amount of iterations
-		 *
-		 * @return string
-		 */
-		private function getSalt($input, $iterations)
-		{
-			$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        /**
+         * Generates the salt used for encryption
+         *
+         * @param string $input      Feed for iteration
+         * @param int    $iterations Amount of iterations
+         *
+         * @return string
+         */
+        private function getSalt($input, $iterations)
+        {
+            $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-			$output = '$2a$';
-			$output .= chr(ord('0') + $iterations / 10);
-			$output .= chr(ord('0') + $iterations % 10);
-			$output .= '$';
+            $output = '$2a$';
+            $output .= chr(ord('0') + $iterations / 10);
+            $output .= chr(ord('0') + $iterations % 10);
+            $output .= '$';
 
-			$i = 0;
-			do {
-				$c1 = ord($input[$i++]);
-				$output .= $itoa64[$c1 >> 2];
-				$c1 = ($c1 & 0x03) << 4;
-				if ($i >= 16) {
-					$output .= $itoa64[$c1];
-					break;
-				}
+            $i = 0;
+            do {
+                $c1 = ord($input[$i++]);
+                $output .= $itoa64[$c1 >> 2];
+                $c1 = ($c1 & 0x03) << 4;
+                if ($i >= 16) {
+                    $output .= $itoa64[$c1];
+                    break;
+                }
 
-				$c2 = ord($input[$i++]);
-				$c1 |= $c2 >> 4;
-				$output .= $itoa64[$c1];
-				$c1 = ($c2 & 0x0f) << 2;
+                $c2 = ord($input[$i++]);
+                $c1 |= $c2 >> 4;
+                $output .= $itoa64[$c1];
+                $c1 = ($c2 & 0x0f) << 2;
 
-				$c2 = ord($input[$i++]);
-				$c1 |= $c2 >> 6;
-				$output .= $itoa64[$c1];
-				$output .= $itoa64[$c2 & 0x3f];
-			} while (1);
+                $c2 = ord($input[$i++]);
+                $c1 |= $c2 >> 6;
+                $output .= $itoa64[$c1];
+                $output .= $itoa64[$c2 & 0x3f];
+            } while (1);
 
-			return $output;
-		}
+            return $output;
+        }
 		
-		/**
-		 * Returns the last used salt for encryption
-		 *
-		 * @return string | NULL
-		 */
-		public function getLastSalt()
-		{
-			return $this->lastSalt;
-		}
+        /**
+         * Returns the last used salt for encryption
+         *
+         * @return string | NULL
+         */
+        public function getLastSalt()
+        {
+            return $this->lastSalt;
+        }
 
-		/**
-		 * Compare the input with a known hash and salt
-		 *
-		 * @param $input
-		 * @param $hash
-		 * @param $salt
-		 * @return bool
-		 */
-		public function compare($input, $hash, $salt)
-		{
-			$newHash = crypt($input, $salt);
-			return $newHash == $hash;
-		}
-	}
+        /**
+         * Compare the input with a known hash and salt
+         *
+         * @param $input
+         * @param $hash
+         * @param $salt
+         * @return bool
+         */
+        public function compare($input, $hash, $salt)
+        {
+            $newHash = crypt($input, $salt);
+            return $newHash == $hash;
+        }
+    }
 }
\ No newline at end of file

src/search/indexer/TermFrequency.php

Indentation +69 added lines, -69 removed lines

@@ -24,92 +24,92 @@
  */
 class TermFrequency
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
 
-	/**
-	 * TermFrequency constructor.
-	 *
-	 * @param \PDO $dbHandle
-	 */
-	public function __construct($dbHandle)
-	{
-		$this->dbHandle = $dbHandle;
-	}
+    /**
+     * TermFrequency constructor.
+     *
+     * @param \PDO $dbHandle
+     */
+    public function __construct($dbHandle)
+    {
+        $this->dbHandle = $dbHandle;
+    }
 
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$totalTermCountPerDocument = $this->getTotalTermCountPerDocument($db);
-		foreach ($totalTermCountPerDocument as $documentField) {
-			$termsForDocumentField = $this->getTermsForDocumentField($documentField->documentPath, $documentField->field);
-			$sql = '
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $totalTermCountPerDocument = $this->getTotalTermCountPerDocument($db);
+        foreach ($totalTermCountPerDocument as $documentField) {
+            $termsForDocumentField = $this->getTermsForDocumentField($documentField->documentPath, $documentField->field);
+            $sql = '
 				INSERT INTO term_frequency (documentPath, field, term, frequency)
 					 VALUES 
 			';
-			$quotedDocumentPath = $db->quote($documentField->documentPath);
-			$quotedField = $db->quote($documentField->field);
-			$values = array();
-			$i = 0;
-			foreach ($termsForDocumentField as $term) {
-				$frequency = intval($term->count) / $documentField->totalTermCount;
-				$values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
-				$i += 1;
-				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-					$this->executeStore($sql, $values, $db);
-					$i = 0;
-					$values = array();
-				}
-			}
-			if (count($values) != 0) {
-				$this->executeStore($sql, $values, $db);
-			}
-		}
-	}
+            $quotedDocumentPath = $db->quote($documentField->documentPath);
+            $quotedField = $db->quote($documentField->field);
+            $values = array();
+            $i = 0;
+            foreach ($termsForDocumentField as $term) {
+                $frequency = intval($term->count) / $documentField->totalTermCount;
+                $values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
+                $i += 1;
+                if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                    $this->executeStore($sql, $values, $db);
+                    $i = 0;
+                    $values = array();
+                }
+            }
+            if (count($values) != 0) {
+                $this->executeStore($sql, $values, $db);
+            }
+        }
+    }
 
-	private function getTermsForDocumentField($documentPath, $field)
-	{
-		$db = $this->dbHandle;
-		$stmt = $db->prepare('
+    private function getTermsForDocumentField($documentPath, $field)
+    {
+        $db = $this->dbHandle;
+        $stmt = $db->prepare('
 			SELECT `term`, `count`
 			  FROM `term_count`
 			 WHERE `documentPath` = :documentPath
 			   AND `field` = :field
 		');
-		$stmt->bindValue(':documentPath', $documentPath);
-		$stmt->bindValue(':field', $field);
-		$stmt->execute();
-		return $stmt->fetchAll(\PDO::FETCH_CLASS);
-	}
+        $stmt->bindValue(':documentPath', $documentPath);
+        $stmt->bindValue(':field', $field);
+        $stmt->execute();
+        return $stmt->fetchAll(\PDO::FETCH_CLASS);
+    }
 
-	/**
-	 * @param $db
-	 *
-	 * @return mixed
-	 */
-	private function getTotalTermCountPerDocument($db)
-	{
-		$stmt = $db->prepare('
+    /**
+     * @param $db
+     *
+     * @return mixed
+     */
+    private function getTotalTermCountPerDocument($db)
+    {
+        $stmt = $db->prepare('
 			SELECT documentPath, field, SUM(count) as totalTermCount
 			  FROM term_count
 		  GROUP BY documentPath, field
 		');
-		$stmt->execute();
-		$totalTermCountPerDocument = $stmt->fetchAll(\PDO::FETCH_CLASS);
+        $stmt->execute();
+        $totalTermCountPerDocument = $stmt->fetchAll(\PDO::FETCH_CLASS);
 
-		return $totalTermCountPerDocument;
-	}
+        return $totalTermCountPerDocument;
+    }
 
-	private function executeStore($sql, $values, $db)
-	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
-		if (!$db->query($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-	}
+    private function executeStore($sql, $values, $db)
+    {
+        $sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+        if (!$db->query($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+    }
 
 }
\ No newline at end of file

src/search/indexer/InverseDocumentFrequency.php

Indentation +39 added lines, -39 removed lines

@@ -10,51 +10,51 @@
 
 class InverseDocumentFrequency
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
-	protected $documentCount;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
+    protected $documentCount;
 
-	/**
-	 * InverseDocumentFrequency constructor.
-	 *
-	 * @param \PDO 	$dbHandle
-	 * @param int   $documentCount
-	 */
-	public function __construct($dbHandle, $documentCount)
-	{
-		$this->dbHandle = $dbHandle;
-		$this->documentCount = $documentCount;
-	}
+    /**
+     * InverseDocumentFrequency constructor.
+     *
+     * @param \PDO 	$dbHandle
+     * @param int   $documentCount
+     */
+    public function __construct($dbHandle, $documentCount)
+    {
+        $this->dbHandle = $dbHandle;
+        $this->documentCount = $documentCount;
+    }
 
-	/**
-	 * Formula to calculate:
-	 * 		idf(t) = 1 + log ( totalDocuments / (documentsThatContainTheTerm + 1))
-	 * @throws \Exception
-	 */
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$db->sqliteCreateFunction('log', 'log', 1);
-		$sql = '
+    /**
+     * Formula to calculate:
+     * 		idf(t) = 1 + log ( totalDocuments / (documentsThatContainTheTerm + 1))
+     * @throws \Exception
+     */
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $db->sqliteCreateFunction('log', 'log', 1);
+        $sql = '
 		INSERT INTO inverse_document_frequency (term, inverseDocumentFrequency)
 		SELECT DISTINCT term, (1+(log(:documentCount / COUNT(documentPath) + 1))) as inverseDocumentFrequency
 					  FROM term_count
 				  GROUP BY term
 		';
 
-		if (!$stmt = $db->prepare($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		$stmt->bindValue(':documentCount', $this->documentCount);
-		$result = $stmt->execute();
-		if ($result === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-	}
+        if (!$stmt = $db->prepare($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        $stmt->bindValue(':documentCount', $this->documentCount);
+        $result = $stmt->execute();
+        if ($result === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+    }
 }
\ No newline at end of file

src/search/indexer/TermCount.php

Indentation +100 added lines, -100 removed lines

@@ -14,113 +14,113 @@
 
 class TermCount
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
-	protected $documents;
-	protected $filters;
-	protected $storage;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
+    protected $documents;
+    protected $filters;
+    protected $storage;
 
-	/**
-	 * TermCount constructor.
-	 *
-	 * @param \PDO    $dbHandle
-	 * @param array   $documents
-	 * @param array   $filters
-	 * @param Storage $jsonStorage
-	 */
-	public function __construct($dbHandle, $documents, $filters, $jsonStorage)
-	{
-		$this->dbHandle = $dbHandle;
-		$this->documents = $documents;
-		$this->filters = $filters;
-		$this->storage = $jsonStorage;
-	}
+    /**
+     * TermCount constructor.
+     *
+     * @param \PDO    $dbHandle
+     * @param array   $documents
+     * @param array   $filters
+     * @param Storage $jsonStorage
+     */
+    public function __construct($dbHandle, $documents, $filters, $jsonStorage)
+    {
+        $this->dbHandle = $dbHandle;
+        $this->documents = $documents;
+        $this->filters = $filters;
+        $this->storage = $jsonStorage;
+    }
 
-	public function execute()
-	{
-		$this->iterateDocumentsAndCreateTermCount($this->documents);
-	}
+    public function execute()
+    {
+        $this->iterateDocumentsAndCreateTermCount($this->documents);
+    }
 
-	protected function applyFilters($tokens)
-	{
-		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
-			$filter = new $filterClassName($tokens);
-			$tokens = $filter->getFilterResults();
-		}
-		return $tokens;
-	}
+    protected function applyFilters($tokens)
+    {
+        foreach ($this->filters as $filterName) {
+            $filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+            $filter = new $filterClassName($tokens);
+            $tokens = $filter->getFilterResults();
+        }
+        return $tokens;
+    }
 
-	protected function storeDocumentTermCount($document, $documentTermCount)
-	{
-		$db = $this->dbHandle;
-		$sqlStart = '
+    protected function storeDocumentTermCount($document, $documentTermCount)
+    {
+        $db = $this->dbHandle;
+        $sqlStart = '
 			INSERT INTO `term_count` (`documentPath`, `term`, `count`, `field`)
 				 VALUES ';
-		$sql = $sqlStart;
-		$values = array();
-		$quotedDocumentPath = $db->quote($document->path);
-		$i = 0;
-		foreach ($documentTermCount as $field => $countArray) {
-			$quotedField = $db->quote($field);
-			foreach ($countArray as $term => $count) {
-				$values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
-				$i += 1;
-				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-					$this->executeStoreDocumentTermCount($values, $sql, $db);
-					$values = array();
-					$sql = $sqlStart;
-					$i = 0;
-				}
-			}
-		}
-		if (count($values) != 0) {
-			$this->executeStoreDocumentTermCount($values, $sql, $db);
-		}
-	}
+        $sql = $sqlStart;
+        $values = array();
+        $quotedDocumentPath = $db->quote($document->path);
+        $i = 0;
+        foreach ($documentTermCount as $field => $countArray) {
+            $quotedField = $db->quote($field);
+            foreach ($countArray as $term => $count) {
+                $values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
+                $i += 1;
+                if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                    $this->executeStoreDocumentTermCount($values, $sql, $db);
+                    $values = array();
+                    $sql = $sqlStart;
+                    $i = 0;
+                }
+            }
+        }
+        if (count($values) != 0) {
+            $this->executeStoreDocumentTermCount($values, $sql, $db);
+        }
+    }
 
-	/**
-	 * @param $values
-	 * @param $sql
-	 * @param $db
-	 *
-	 * @throws \Exception
-	 */
-	protected function executeStoreDocumentTermCount($values, $sql, $db)
-	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
-		$stmt = $db->prepare($sql);
-		if ($stmt === false || !$stmt->execute()) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-	}
+    /**
+     * @param $values
+     * @param $sql
+     * @param $db
+     *
+     * @throws \Exception
+     */
+    protected function executeStoreDocumentTermCount($values, $sql, $db)
+    {
+        $sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+        $stmt = $db->prepare($sql);
+        if ($stmt === false || !$stmt->execute()) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+    }
 
-	/**
-	 * @param $document
-	 */
-	private function createTermCountForDocument($document)
-	{
-		$tokenizer = new DocumentTokenizer($document, $this->storage);
-		$tokens = $tokenizer->getTokens();
-		$documentTermCount = $this->applyFilters($tokens);
-		$this->storeDocumentTermCount($document, $documentTermCount);
-	}
+    /**
+     * @param $document
+     */
+    private function createTermCountForDocument($document)
+    {
+        $tokenizer = new DocumentTokenizer($document, $this->storage);
+        $tokens = $tokenizer->getTokens();
+        $documentTermCount = $this->applyFilters($tokens);
+        $this->storeDocumentTermCount($document, $documentTermCount);
+    }
 
-	/**
-	 * @param $documents
-	 */
-	private function iterateDocumentsAndCreateTermCount($documents)
-	{
-		foreach ($documents as $document) {
-			if ($document->type === 'folder') {
-				$this->iterateDocumentsAndCreateTermCount($document->content);
-			} else {
-				$this->createTermCountForDocument($document);
-			}
-		}
-	}
+    /**
+     * @param $documents
+     */
+    private function iterateDocumentsAndCreateTermCount($documents)
+    {
+        foreach ($documents as $document) {
+            if ($document->type === 'folder') {
+                $this->iterateDocumentsAndCreateTermCount($document->content);
+            } else {
+                $this->createTermCountForDocument($document);
+            }
+        }
+    }
 }
\ No newline at end of file

src/search/indexer/TermFieldLengthNorm.php

Indentation +61 added lines, -61 removed lines

@@ -17,72 +17,72 @@
  */
 class TermFieldLengthNorm
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
 
-	/**
-	 * TermFieldLengthNorm constructor.
-	 *
-	 * @param \PDO $dbHandle
-	 */
-	public function __construct($dbHandle)
-	{
-		$this->dbHandle = $dbHandle;
-	}
+    /**
+     * TermFieldLengthNorm constructor.
+     *
+     * @param \PDO $dbHandle
+     */
+    public function __construct($dbHandle)
+    {
+        $this->dbHandle = $dbHandle;
+    }
 
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$db->sqliteCreateFunction('sqrt', 'sqrt', 1);
-		$sql = '
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $db->sqliteCreateFunction('sqrt', 'sqrt', 1);
+        $sql = '
 		SELECT documentPath, field, COUNT(`count`) as termCount
 		  FROM term_count
 	  GROUP BY documentPath, field
 		';
-		$stmt = $db->prepare($sql);
-		if ($stmt === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		if (($stmt->execute()) === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		$uniqueFieldsPerDocument = $stmt->fetchAll(\PDO::FETCH_OBJ);
-		$values = array();
-		$i = 0;
-		foreach ($uniqueFieldsPerDocument as $fieldRow) {
-			$values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt(' . intval($fieldRow->termCount) . ') WHERE documentPath = ' . $db->quote($fieldRow->documentPath) . ' AND field = ' . $db->quote($fieldRow->field) . ';';
-			$i += 1;
-			if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-				$this->executeUpdateTermNorm($values, $db);
-				$values = array();
-				$i = 0;
-			}
-		}
-		if (count($values) != 0) {
-			$this->executeUpdateTermNorm($values, $db);
-		}
-	}
+        $stmt = $db->prepare($sql);
+        if ($stmt === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        if (($stmt->execute()) === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        $uniqueFieldsPerDocument = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        $values = array();
+        $i = 0;
+        foreach ($uniqueFieldsPerDocument as $fieldRow) {
+            $values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt(' . intval($fieldRow->termCount) . ') WHERE documentPath = ' . $db->quote($fieldRow->documentPath) . ' AND field = ' . $db->quote($fieldRow->field) . ';';
+            $i += 1;
+            if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                $this->executeUpdateTermNorm($values, $db);
+                $values = array();
+                $i = 0;
+            }
+        }
+        if (count($values) != 0) {
+            $this->executeUpdateTermNorm($values, $db);
+        }
+    }
 
-	/**
-	 * @param array $values
-	 * @param \PDO $db
-	 * @throws \Exception
-	 */
-	private function executeUpdateTermNorm($values, $db)
-	{
-		$sql  = 'BEGIN TRANSACTION;' . PHP_EOL;
-		$sql .= implode(PHP_EOL, $values) . PHP_EOL;
-		$sql .= 'COMMIT;';
-		if (($db->exec($sql)) === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-	}
+    /**
+     * @param array $values
+     * @param \PDO $db
+     * @throws \Exception
+     */
+    private function executeUpdateTermNorm($values, $db)
+    {
+        $sql  = 'BEGIN TRANSACTION;' . PHP_EOL;
+        $sql .= implode(PHP_EOL, $values) . PHP_EOL;
+        $sql .= 'COMMIT;';
+        if (($db->exec($sql)) === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+    }
 }
\ No newline at end of file

src/search/Search.php

Indentation +225 added lines, -225 removed lines

@@ -26,117 +26,117 @@ 
  */
 class Search extends SearchDbConnected
 {
-	/**
-	 * @var Tokenizer
-	 */
-	protected $tokenizer;
-	protected $results = array();
+    /**
+     * @var Tokenizer
+     */
+    protected $tokenizer;
+    protected $results = array();
 
-	/**
-	 * An array containing classes implementing \CloudControl\Cms\search\Filters
-	 * These will be applied to all tokenizers
-	 * @var array
-	 */
-	protected $filters = array(
-		'DutchStopWords',
-		'EnglishStopWords'
-	);
+    /**
+     * An array containing classes implementing \CloudControl\Cms\search\Filters
+     * These will be applied to all tokenizers
+     * @var array
+     */
+    protected $filters = array(
+        'DutchStopWords',
+        'EnglishStopWords'
+    );
 
-	/**
-	 * Returns an array of SeachResult and / or SearchSuggestion objects,
-	 * based on the tokens in the Tokenizer
-	 * @param Tokenizer $tokenizer
-	 *
-	 * @return array
-	 */
-	public function getDocumentsForTokenizer(Tokenizer $tokenizer)
-	{
-		$this->tokenizer = $tokenizer;
-		$resultsPerTokens = $this->queryTokens();
+    /**
+     * Returns an array of SeachResult and / or SearchSuggestion objects,
+     * based on the tokens in the Tokenizer
+     * @param Tokenizer $tokenizer
+     *
+     * @return array
+     */
+    public function getDocumentsForTokenizer(Tokenizer $tokenizer)
+    {
+        $this->tokenizer = $tokenizer;
+        $resultsPerTokens = $this->queryTokens();
 
-		$flatResults = $this->flattenResults($resultsPerTokens);
-		$flatResults = $this->applyQueryCoordination($flatResults);
-		usort($flatResults, array($this, "scoreCompare"));
+        $flatResults = $this->flattenResults($resultsPerTokens);
+        $flatResults = $this->applyQueryCoordination($flatResults);
+        usort($flatResults, array($this, "scoreCompare"));
 
-		$flatResults = array_merge($this->getSearchSuggestions(), $flatResults);
+        $flatResults = array_merge($this->getSearchSuggestions(), $flatResults);
 
-		return $flatResults;
-	}
+        return $flatResults;
+    }
 
-	/**
-	 * Returns the amount of distinct documents
-	 * that are currently in the search index.
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function getIndexedDocuments()
-	{
-		$db = $this->getSearchDbHandle();
-		$sql = '
+    /**
+     * Returns the amount of distinct documents
+     * that are currently in the search index.
+     * @return int
+     * @throws \Exception
+     */
+    public function getIndexedDocuments()
+    {
+        $db = $this->getSearchDbHandle();
+        $sql = '
 			SELECT count(DISTINCT documentPath) as indexedDocuments
 			  FROM term_frequency
 		';
-		if (!$stmt = $db->query($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		$result = $stmt->fetch(\PDO::FETCH_COLUMN);
-		if (false === $result) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		return intval($result);
-	}
+        if (!$stmt = $db->query($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        $result = $stmt->fetch(\PDO::FETCH_COLUMN);
+        if (false === $result) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        return intval($result);
+    }
 
-	/**
-	 * Queries each token present in the Tokenizer
-	 * and returns SearchResult objects for the found
-	 * documents
-	 * @return array
-	 */
-	private function queryTokens()
-	{
-		$tokens = $this->getTokens();
+    /**
+     * Queries each token present in the Tokenizer
+     * and returns SearchResult objects for the found
+     * documents
+     * @return array
+     */
+    private function queryTokens()
+    {
+        $tokens = $this->getTokens();
 
-		$queryNorm = $this->getQueryNorm($tokens);
-		$results = array();
-		foreach ($tokens as $token) {
-			$results[$token] = $this->getResultsForToken($token, $queryNorm);
-		}
-		return $results;
-	}
+        $queryNorm = $this->getQueryNorm($tokens);
+        $results = array();
+        foreach ($tokens as $token) {
+            $results[$token] = $this->getResultsForToken($token, $queryNorm);
+        }
+        return $results;
+    }
 
-	/**
-	 * Applies the Filter objects in the the filter array to the
-	 * tokens in the Tokenizer
-	 * @param $tokens
-	 *
-	 * @return mixed
-	 */
-	protected function applyFilters($tokens)
-	{
-		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
-			$filter = new $filterClassName($tokens);
-			$tokens = $filter->getFilterResults();
-		}
-		return $tokens;
-	}
+    /**
+     * Applies the Filter objects in the the filter array to the
+     * tokens in the Tokenizer
+     * @param $tokens
+     *
+     * @return mixed
+     */
+    protected function applyFilters($tokens)
+    {
+        foreach ($this->filters as $filterName) {
+            $filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+            $filter = new $filterClassName($tokens);
+            $tokens = $filter->getFilterResults();
+        }
+        return $tokens;
+    }
 
-	/**
-	 * Queries the search index for a given token
-	 * and the query norm.
-	 * @param $token
-	 * @param $queryNorm
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getResultsForToken($token, $queryNorm) {
-		$db = $this->getSearchDbHandle();
-		$sql = '
+    /**
+     * Queries the search index for a given token
+     * and the query norm.
+     * @param $token
+     * @param $queryNorm
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getResultsForToken($token, $queryNorm) {
+        $db = $this->getSearchDbHandle();
+        $sql = '
 			SELECT (:queryNorm * 
 						(SUM(term_frequency.frequency) --TF
 						* inverse_document_frequency.inverseDocumentFrequency -- IDF
@@ -154,113 +154,113 @@ 
 		  GROUP BY term_frequency.documentPath, term_frequency.term
 		  ORDER BY score DESC
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-		}
-		$stmt->bindValue(':query', $token);
-		$stmt->bindValue(':queryNorm', $queryNorm);
-		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-		}
-		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
-	}
+        if(!$stmt = $db->prepare($sql)) {
+            throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+        }
+        $stmt->bindValue(':query', $token);
+        $stmt->bindValue(':queryNorm', $queryNorm);
+        if (!$stmt->execute()) {
+            throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+        }
+        return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
+    }
 
-	/**
-	 * @param $resultsPerTokens
-	 *
-	 * @return array
-	 */
-	private function flattenResults($resultsPerTokens)
-	{
-		$finalResults = array();
-		foreach ($resultsPerTokens as $token => $resultPerToken) {
-			foreach ($resultPerToken as $result) {
-				if (isset($finalResults[$result->documentPath])) {
-					$finalResults[$result->documentPath]->score += $result->score;
-					$finalResults[$result->documentPath]->matchingTokens[] = $token;
-				} else {
-					$resultObj = new SearchResult();
-					$resultObj->documentPath = $result->documentPath;
-					$resultObj->matchingTokens = array($token);
-					$resultObj->score = floatval($result->score);
-					$resultObj->setStorage($this->storage);
-					$finalResults[$result->documentPath] = $resultObj;
-				}
-			}
-		}
-		return $finalResults;
-	}
+    /**
+     * @param $resultsPerTokens
+     *
+     * @return array
+     */
+    private function flattenResults($resultsPerTokens)
+    {
+        $finalResults = array();
+        foreach ($resultsPerTokens as $token => $resultPerToken) {
+            foreach ($resultPerToken as $result) {
+                if (isset($finalResults[$result->documentPath])) {
+                    $finalResults[$result->documentPath]->score += $result->score;
+                    $finalResults[$result->documentPath]->matchingTokens[] = $token;
+                } else {
+                    $resultObj = new SearchResult();
+                    $resultObj->documentPath = $result->documentPath;
+                    $resultObj->matchingTokens = array($token);
+                    $resultObj->score = floatval($result->score);
+                    $resultObj->setStorage($this->storage);
+                    $finalResults[$result->documentPath] = $resultObj;
+                }
+            }
+        }
+        return $finalResults;
+    }
 
-	private function scoreCompare($a, $b) {
-		if ($a->score == $b->score) {
-			return 0;
-		}
-		return ($a->score > $b->score) ? -1 : 1;
-	}
+    private function scoreCompare($a, $b) {
+        if ($a->score == $b->score) {
+            return 0;
+        }
+        return ($a->score > $b->score) ? -1 : 1;
+    }
 
-	/**
-	 * Calculates the query norm for all tokens in the Tokenizer
-	 * @param $tokens
-	 *
-	 * @return int
-	 * @throws \Exception
-	 */
-	private function getQueryNorm($tokens)
-	{
-		$db = $this->getSearchDbHandle();
-		$db->sqliteCreateFunction('sqrt', 'sqrt', 1);
-		foreach ($tokens as $key => $token) {
-			$tokens[$key] = $db->quote($token);
-		}
-		$terms = implode(',', $tokens);
-		$sql = '
+    /**
+     * Calculates the query norm for all tokens in the Tokenizer
+     * @param $tokens
+     *
+     * @return int
+     * @throws \Exception
+     */
+    private function getQueryNorm($tokens)
+    {
+        $db = $this->getSearchDbHandle();
+        $db->sqliteCreateFunction('sqrt', 'sqrt', 1);
+        foreach ($tokens as $key => $token) {
+            $tokens[$key] = $db->quote($token);
+        }
+        $terms = implode(',', $tokens);
+        $sql = '
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
 			  FROM inverse_document_frequency
 			 WHERE term IN (' . $terms . ') 
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-		}
-		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-		}
-		$result = $stmt->fetch(\PDO::FETCH_OBJ);
-		return $result->queryNorm == null ? 1 : $result->queryNorm;
-	}
+        if(!$stmt = $db->prepare($sql)) {
+            throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+        }
+        if (!$stmt->execute()) {
+            throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+        }
+        $result = $stmt->fetch(\PDO::FETCH_OBJ);
+        return $result->queryNorm == null ? 1 : $result->queryNorm;
+    }
 
-	/**
-	 * Applies query coordination to all results
-	 * @param $flatResults
-	 *
-	 * @return mixed
-	 */
-	private function applyQueryCoordination($flatResults)
-	{
-		$tokenVector = $this->tokenizer->getTokenVector();
-		$tokens = array_keys($tokenVector);
-		$tokenCount = count($tokens);
-		foreach ($flatResults as $key => $result) {
-			$matchCount = count($result->matchingTokens);
-			$result->score = ($matchCount / $tokenCount) * $result->score;
-			$flatResults[$key] = $result;
-		}
-		return $flatResults;
-	}
+    /**
+     * Applies query coordination to all results
+     * @param $flatResults
+     *
+     * @return mixed
+     */
+    private function applyQueryCoordination($flatResults)
+    {
+        $tokenVector = $this->tokenizer->getTokenVector();
+        $tokens = array_keys($tokenVector);
+        $tokenCount = count($tokens);
+        foreach ($flatResults as $key => $result) {
+            $matchCount = count($result->matchingTokens);
+            $result->score = ($matchCount / $tokenCount) * $result->score;
+            $flatResults[$key] = $result;
+        }
+        return $flatResults;
+    }
 
-	/**
-	 * Uses the levenshtein algorithm to determine the term that is
-	 * closest to the token that was input for the search
-	 * @return array
-	 * @throws \Exception
-	 */
-	private function getSearchSuggestions()
-	{
-		$tokens = $this->getTokens();
-		$allResults = array();
-		foreach ($tokens as $token) {
-			$db = $this->getSearchDbHandle();
-			$db->sqliteCreateFunction('levenshtein', 'levenshtein', 2);
-			$sql = '
+    /**
+     * Uses the levenshtein algorithm to determine the term that is
+     * closest to the token that was input for the search
+     * @return array
+     * @throws \Exception
+     */
+    private function getSearchSuggestions()
+    {
+        $tokens = $this->getTokens();
+        $allResults = array();
+        foreach ($tokens as $token) {
+            $db = $this->getSearchDbHandle();
+            $db->sqliteCreateFunction('levenshtein', 'levenshtein', 2);
+            $sql = '
 				SELECT *
 				  FROM (
 				  	SELECT :token as original, term, levenshtein(term, :token) as editDistance
@@ -270,35 +270,35 @@ 
 			  	     )
 			  	   WHERE editDistance > 0
 			';
-			$stmt = $db->prepare($sql);
-			if ($stmt === false) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-			}
-			$stmt->bindValue(':token', $token);
-			if (($stmt === false) | (!$stmt->execute())) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
-			}
-			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
-			$allResults = array_merge($result, $allResults);
-		}
-		return $allResults;
-	}
+            $stmt = $db->prepare($sql);
+            if ($stmt === false) {
+                throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+            }
+            $stmt->bindValue(':token', $token);
+            if (($stmt === false) | (!$stmt->execute())) {
+                throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+            }
+            $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
+            $allResults = array_merge($result, $allResults);
+        }
+        return $allResults;
+    }
 
-	/**
-	 * Retrieves all tokens from the tokenizer
-	 * @return array
-	 */
-	private function getTokens()
-	{
-		$tokenVector = array(
-			'query' => array(),
-		);
-		$tokenVector['query'] = $this->tokenizer->getTokenVector();
-		$tokens = $this->applyFilters($tokenVector);
-		if (!empty($tokens)) {
-			$tokens = array_keys($tokens['query']);
-		}
+    /**
+     * Retrieves all tokens from the tokenizer
+     * @return array
+     */
+    private function getTokens()
+    {
+        $tokenVector = array(
+            'query' => array(),
+        );
+        $tokenVector['query'] = $this->tokenizer->getTokenVector();
+        $tokens = $this->applyFilters($tokenVector);
+        if (!empty($tokens)) {
+            $tokens = array_keys($tokens['query']);
+        }
 
-		return $tokens;
-	}
+        return $tokens;
+    }
 }
\ No newline at end of file

src/search/Tokenizer.php

Indentation +41 added lines, -41 removed lines

@@ -13,47 +13,47 @@
  */
 class Tokenizer
 {
-	protected $inputString;
-	protected $tokenVector = array();
-
-	/**
-	 * Tokenizer constructor.
-	 *
-	 * @param string $string Should preferably be parsed wit \CloudControl\Cms\search\CharacterFilter
-	 * @see \CloudControl\Cms\search\CharacterFilter
-	 */
-	public function __construct($string)
-	{
-		$this->inputString = $string;
-		$this->tokenize();
-	}
-
-	protected function tokenize()
-	{
-		$tokens = explode(' ', $this->inputString);
-		foreach ($tokens as $token) {
-			$this->addTokenToVector($token);
-		}
-	}
-
-	protected function addTokenToVector($token)
-	{
-		if (!empty($token)) {
-			if (isset($this->tokenVector[$token])) {
-				$this->tokenVector[$token] += 1;
-			} else {
-				$this->tokenVector[$token] = 1;
-			}
-		}
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getTokenVector()
-	{
-		return $this->tokenVector;
-	}
+    protected $inputString;
+    protected $tokenVector = array();
+
+    /**
+     * Tokenizer constructor.
+     *
+     * @param string $string Should preferably be parsed wit \CloudControl\Cms\search\CharacterFilter
+     * @see \CloudControl\Cms\search\CharacterFilter
+     */
+    public function __construct($string)
+    {
+        $this->inputString = $string;
+        $this->tokenize();
+    }
+
+    protected function tokenize()
+    {
+        $tokens = explode(' ', $this->inputString);
+        foreach ($tokens as $token) {
+            $this->addTokenToVector($token);
+        }
+    }
+
+    protected function addTokenToVector($token)
+    {
+        if (!empty($token)) {
+            if (isset($this->tokenVector[$token])) {
+                $this->tokenVector[$token] += 1;
+            } else {
+                $this->tokenVector[$token] = 1;
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getTokenVector()
+    {
+        return $this->tokenVector;
+    }
 
 
 }
\ No newline at end of file