@@ -38,14 +38,14 @@ discard block |
||
38 | 38 | return '0 seconds'; |
39 | 39 | } |
40 | 40 | |
41 | - $a = array( 365 * 24 * 60 * 60 => 'year', |
|
41 | + $a = array(365 * 24 * 60 * 60 => 'year', |
|
42 | 42 | 30 * 24 * 60 * 60 => 'month', |
43 | 43 | 24 * 60 * 60 => 'day', |
44 | 44 | 60 * 60 => 'hour', |
45 | 45 | 60 => 'minute', |
46 | 46 | 1 => 'second' |
47 | 47 | ); |
48 | - $a_plural = array( 'year' => 'years', |
|
48 | + $a_plural = array('year' => 'years', |
|
49 | 49 | 'month' => 'months', |
50 | 50 | 'day' => 'days', |
51 | 51 | 'hour' => 'hours', |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | if ($d >= 1) |
60 | 60 | { |
61 | 61 | $r = round($d); |
62 | - return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago'; |
|
62 | + return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago'; |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | return 0; |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | * @param string $unit |
74 | 74 | * @return string |
75 | 75 | */ |
76 | -function humanFileSize($size,$unit="") { |
|
77 | - if( (!$unit && $size >= 1<<30) || $unit == "GB") |
|
78 | - return number_format($size/(1<<30),2)."GB"; |
|
79 | - if( (!$unit && $size >= 1<<20) || $unit == "MB") |
|
80 | - return number_format($size/(1<<20),2)."MB"; |
|
81 | - if( (!$unit && $size >= 1<<10) || $unit == "KB") |
|
82 | - return number_format($size/(1<<10),2)."KB"; |
|
76 | +function humanFileSize($size, $unit = "") { |
|
77 | + if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
|
78 | + return number_format($size / (1 << 30), 2)."GB"; |
|
79 | + if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
|
80 | + return number_format($size / (1 << 20), 2)."MB"; |
|
81 | + if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
|
82 | + return number_format($size / (1 << 10), 2)."KB"; |
|
83 | 83 | return number_format($size)." bytes"; |
84 | 84 | } |
85 | 85 | |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @return mixed|string |
135 | 135 | */ |
136 | -function slugify($str, $replace=array(), $delimiter='-') { |
|
137 | - if( !empty($replace) ) { |
|
138 | - $str = str_replace((array)$replace, ' ', $str); |
|
136 | +function slugify($str, $replace = array(), $delimiter = '-') { |
|
137 | + if (!empty($replace)) { |
|
138 | + $str = str_replace((array) $replace, ' ', $str); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str); |
@@ -158,13 +158,13 @@ discard block |
||
158 | 158 | { |
159 | 159 | $debug_backtrace = current(debug_backtrace()); |
160 | 160 | if (PHP_SAPI == 'cli') { |
161 | - echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n"; |
|
161 | + echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n"; |
|
162 | 162 | foreach (func_get_args() as $data) { |
163 | 163 | var_dump($data); |
164 | 164 | } |
165 | 165 | } else { |
166 | 166 | ob_clean(); |
167 | - echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>"; |
|
167 | + echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>"; |
|
168 | 168 | echo '<pre>'; |
169 | 169 | foreach (func_get_args() as $data) { |
170 | 170 | echo "<code>"; |
@@ -212,8 +212,8 @@ discard block |
||
212 | 212 | */ |
213 | 213 | function utf8Convert($array) |
214 | 214 | { |
215 | - array_walk_recursive($array, function(&$item){ |
|
216 | - if(!mb_detect_encoding($item, 'utf-8', true)){ |
|
215 | + array_walk_recursive($array, function(&$item) { |
|
216 | + if (!mb_detect_encoding($item, 'utf-8', true)) { |
|
217 | 217 | $item = utf8_encode($item); |
218 | 218 | } |
219 | 219 | }); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | private function config() |
38 | 38 | { |
39 | - $storagePath = __DIR__ . '/../../' . $this->storageDir; |
|
39 | + $storagePath = __DIR__.'/../../'.$this->storageDir; |
|
40 | 40 | if (realpath($storagePath) === false) { |
41 | 41 | initFramework(); |
42 | 42 | if (Repository::create($storagePath)) { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $repository->init(); |
45 | 45 | $this->repository = $repository; |
46 | 46 | } else { |
47 | - throw new \Exception('Could not create repository directory: ' . $storagePath); |
|
47 | + throw new \Exception('Could not create repository directory: '.$storagePath); |
|
48 | 48 | } |
49 | 49 | } else { |
50 | 50 | $this->repository = new Repository($storagePath); |
@@ -229,20 +229,20 @@ discard block |
||
229 | 229 | */ |
230 | 230 | public function getDocumentBySlug($slug) |
231 | 231 | { |
232 | - $path = '/' . $slug; |
|
232 | + $path = '/'.$slug; |
|
233 | 233 | return $this->repository->getDocumentByPath($path); |
234 | 234 | } |
235 | 235 | |
236 | 236 | public function saveDocument($postValues) |
237 | 237 | { |
238 | - $oldPath = '/' . $postValues['path']; |
|
238 | + $oldPath = '/'.$postValues['path']; |
|
239 | 239 | |
240 | 240 | $container = $this->getDocumentContainerByPath($oldPath); |
241 | 241 | $documentObject = $this->createDocumentFromPostValues($postValues); |
242 | 242 | if ($container->path === '/') { |
243 | - $newPath = $container->path . $documentObject->slug; |
|
243 | + $newPath = $container->path.$documentObject->slug; |
|
244 | 244 | } else { |
245 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
245 | + $newPath = $container->path.'/'.$documentObject->slug; |
|
246 | 246 | } |
247 | 247 | $documentObject->path = $newPath; |
248 | 248 | $this->repository->saveDocument($documentObject); |
@@ -252,9 +252,9 @@ discard block |
||
252 | 252 | { |
253 | 253 | $documentObject = $this->createDocumentFromPostValues($postValues); |
254 | 254 | if ($postValues['path'] === '/') { |
255 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
255 | + $documentObject->path = $postValues['path'].$documentObject->slug; |
|
256 | 256 | } else { |
257 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
257 | + $documentObject->path = $postValues['path'].'/'.$documentObject->slug; |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | $this->repository->saveDocument($documentObject); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | |
263 | 263 | public function deleteDocumentBySlug($slug) |
264 | 264 | { |
265 | - $path = '/' . $slug; |
|
265 | + $path = '/'.$slug; |
|
266 | 266 | $this->repository->deleteDocumentByPath($path); |
267 | 267 | } |
268 | 268 | |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | { |
351 | 351 | $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
352 | 352 | if ($postValues['path'] === '/') { |
353 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
353 | + $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug; |
|
354 | 354 | } else { |
355 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
355 | + $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug; |
|
356 | 356 | } |
357 | 357 | $this->repository->saveDocument($documentFolderObject); |
358 | 358 | } |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | */ |
367 | 367 | public function deleteDocumentFolderBySlug($slug) |
368 | 368 | { |
369 | - $path = '/' . $slug; |
|
369 | + $path = '/'.$slug; |
|
370 | 370 | $this->repository->deleteDocumentByPath($path); |
371 | 371 | } |
372 | 372 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | */ |
381 | 381 | public function getDocumentFolderBySlug($slug) |
382 | 382 | { |
383 | - $path = '/' . $slug; |
|
383 | + $path = '/'.$slug; |
|
384 | 384 | return $this->repository->getDocumentByPath($path); |
385 | 385 | } |
386 | 386 | |
@@ -591,13 +591,13 @@ discard block |
||
591 | 591 | |
592 | 592 | public function addImage($postValues) |
593 | 593 | { |
594 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
594 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
595 | 595 | |
596 | 596 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
597 | - $destination = $destinationPath . '/' . $filename; |
|
597 | + $destination = $destinationPath.'/'.$filename; |
|
598 | 598 | |
599 | 599 | if ($postValues['error'] != '0') { |
600 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
600 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
601 | 601 | } |
602 | 602 | |
603 | 603 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -622,14 +622,14 @@ discard block |
||
622 | 622 | |
623 | 623 | public function deleteImageByName($filename) |
624 | 624 | { |
625 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
625 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
626 | 626 | |
627 | 627 | $images = $this->getImages(); |
628 | 628 | |
629 | 629 | foreach ($images as $key => $image) { |
630 | 630 | if ($image->file == $filename) { |
631 | 631 | foreach ($image->set as $imageSetFilename) { |
632 | - $destination = $destinationPath . '/' . $imageSetFilename; |
|
632 | + $destination = $destinationPath.'/'.$imageSetFilename; |
|
633 | 633 | if (file_exists($destination)) { |
634 | 634 | unlink($destination); |
635 | 635 | } else { |
@@ -671,7 +671,7 @@ discard block |
||
671 | 671 | */ |
672 | 672 | public function getFiles() |
673 | 673 | { |
674 | - $files = $this->repository->files; |
|
674 | + $files = $this->repository->files; |
|
675 | 675 | usort($files, array($this, 'compareFiles')); |
676 | 676 | return $files; |
677 | 677 | } |
@@ -683,13 +683,13 @@ discard block |
||
683 | 683 | |
684 | 684 | public function addFile($postValues) |
685 | 685 | { |
686 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
686 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
687 | 687 | |
688 | 688 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
689 | - $destination = $destinationPath . '/' . $filename; |
|
689 | + $destination = $destinationPath.'/'.$filename; |
|
690 | 690 | |
691 | 691 | if ($postValues['error'] != '0') { |
692 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
692 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
693 | 693 | } |
694 | 694 | |
695 | 695 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -715,23 +715,23 @@ discard block |
||
715 | 715 | array_pop($fileParts); |
716 | 716 | $fileNameWithoutExtension = implode('-', $fileParts); |
717 | 717 | $fileNameWithoutExtension = slugify($fileNameWithoutExtension); |
718 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
718 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
719 | 719 | } else { |
720 | 720 | $filename = slugify($filename); |
721 | 721 | } |
722 | 722 | |
723 | - if (file_exists($path . '/' . $filename)) { |
|
723 | + if (file_exists($path.'/'.$filename)) { |
|
724 | 724 | $fileParts = explode('.', $filename); |
725 | 725 | if (count($fileParts) > 1) { |
726 | 726 | $extension = end($fileParts); |
727 | 727 | array_pop($fileParts); |
728 | 728 | $fileNameWithoutExtension = implode('-', $fileParts); |
729 | 729 | $fileNameWithoutExtension .= '-copy'; |
730 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
730 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
731 | 731 | } else { |
732 | 732 | $filename .= '-copy'; |
733 | 733 | } |
734 | - return $this->validateFilename($filename,$path); |
|
734 | + return $this->validateFilename($filename, $path); |
|
735 | 735 | } |
736 | 736 | return $filename; |
737 | 737 | } |
@@ -757,8 +757,8 @@ discard block |
||
757 | 757 | */ |
758 | 758 | public function deleteFileByName($filename) |
759 | 759 | { |
760 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
761 | - $destination = $destinationPath . '/' . $filename; |
|
760 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
761 | + $destination = $destinationPath.'/'.$filename; |
|
762 | 762 | |
763 | 763 | if (file_exists($destination)) { |
764 | 764 | $files = $this->getFiles(); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $this->resetIndex(); |
59 | 59 | $this->addLog('Retrieving documents to be indexed.'); |
60 | 60 | $documents = $this->storage->getDocuments(); |
61 | - $this->addLog('Start Document Term Count for ' . count($documents) . ' documents'); |
|
61 | + $this->addLog('Start Document Term Count for '.count($documents).' documents'); |
|
62 | 62 | $this->createDocumentTermCount($documents); |
63 | 63 | $this->addLog('Start Document Term Frequency.'); |
64 | 64 | $this->createDocumentTermFrequency(); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | private function addLog($string) |
160 | 160 | { |
161 | 161 | $currentTime = round(microtime(true) * 1000); |
162 | - $this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL; |
|
162 | + $this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL; |
|
163 | 163 | $this->lastLog = round(microtime(true) * 1000); |
164 | 164 | } |
165 | 165 | |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | protected function getSearchDbHandle() |
172 | 172 | { |
173 | 173 | if ($this->searchDbHandle === null) { |
174 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR; |
|
175 | - $this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB); |
|
174 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR; |
|
175 | + $this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB); |
|
176 | 176 | } |
177 | 177 | return $this->searchDbHandle; |
178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | public function replaceOldIndex() |
184 | 184 | { |
185 | 185 | $this->searchDbHandle = null; |
186 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR; |
|
187 | - rename($path . self::SEARCH_TEMP_DB, $path . 'search.db'); |
|
186 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR; |
|
187 | + rename($path.self::SEARCH_TEMP_DB, $path.'search.db'); |
|
188 | 188 | } |
189 | 189 | } |
190 | 190 | \ No newline at end of file |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | if (!$stmt = $db->query($sql)) { |
80 | 80 | $errorInfo = $db->errorInfo(); |
81 | 81 | $errorMsg = $errorInfo[2]; |
82 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
82 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
83 | 83 | } |
84 | 84 | $result = $stmt->fetch(\PDO::FETCH_COLUMN); |
85 | 85 | if (false === $result) { |
86 | 86 | $errorInfo = $db->errorInfo(); |
87 | 87 | $errorMsg = $errorInfo[2]; |
88 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
88 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
89 | 89 | } |
90 | 90 | return intval($result); |
91 | 91 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | protected function applyFilters($tokens) |
119 | 119 | { |
120 | 120 | foreach ($this->filters as $filterName) { |
121 | - $filterClassName = '\library\search\filters\\' . $filterName; |
|
121 | + $filterClassName = '\library\search\filters\\'.$filterName; |
|
122 | 122 | $filter = new $filterClassName($tokens); |
123 | 123 | $tokens = $filter->getFilterResults(); |
124 | 124 | } |
@@ -154,13 +154,13 @@ discard block |
||
154 | 154 | GROUP BY term_frequency.documentPath, term_frequency.term |
155 | 155 | ORDER BY score DESC |
156 | 156 | '; |
157 | - if(!$stmt = $db->prepare($sql)) { |
|
158 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
157 | + if (!$stmt = $db->prepare($sql)) { |
|
158 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
159 | 159 | } |
160 | 160 | $stmt->bindValue(':query', $token); |
161 | 161 | $stmt->bindValue(':queryNorm', $queryNorm); |
162 | 162 | if (!$stmt->execute()) { |
163 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
163 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
164 | 164 | } |
165 | 165 | return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchResult'); |
166 | 166 | } |
@@ -216,13 +216,13 @@ discard block |
||
216 | 216 | $sql = ' |
217 | 217 | SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm |
218 | 218 | FROM inverse_document_frequency |
219 | - WHERE term IN (' . $terms . ') |
|
219 | + WHERE term IN (' . $terms.') |
|
220 | 220 | '; |
221 | - if(!$stmt = $db->prepare($sql)) { |
|
222 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
221 | + if (!$stmt = $db->prepare($sql)) { |
|
222 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
223 | 223 | } |
224 | 224 | if (!$stmt->execute()) { |
225 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
225 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
226 | 226 | } |
227 | 227 | $result = $stmt->fetch(\PDO::FETCH_OBJ); |
228 | 228 | return $result->queryNorm == null ? 1 : $result->queryNorm; |
@@ -272,11 +272,11 @@ discard block |
||
272 | 272 | '; |
273 | 273 | $stmt = $db->prepare($sql); |
274 | 274 | if ($stmt === false) { |
275 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
275 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
276 | 276 | } |
277 | 277 | $stmt->bindValue(':token', $token); |
278 | 278 | if ($stmt === false | !$stmt->execute()) { |
279 | - throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>'); |
|
279 | + throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>'); |
|
280 | 280 | } |
281 | 281 | $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchSuggestion'); |
282 | 282 | $allResults = array_merge($result, $allResults); |
@@ -13,7 +13,7 @@ |
||
13 | 13 | class DutchStopWords implements Filter |
14 | 14 | { |
15 | 15 | protected $tokens; |
16 | - protected $dutchStopWords = array('aan','af','al','alles','als','altijd','andere','ben','bij','daar','dan','dat','de','der','deze','die','dit','doch','doen','door','doorgaans','dus','een','eens','en','er','ge','geen','geweest','haar','had','heb','hebben','heeft','hem','het','hier','hij','hoe','hun','iemand','iets','ik','in','is','ja','je','kan','kon','kunnen','maar','me','meer','men','met','mij','mijn','moet','na','naar','niet','niets','nog','nu','of','om','omdat','ons','ook','op','over','reeds','te','tegen','toch','toen','tot','u','uit','uw','van','veel','voor','want','waren','was','wat','we','wel','werd','wezen','wie','wij','wil','worden','zal','ze','zei','zelf','zich','zij','zijn','zo','zodat','zonder','zou'); |
|
16 | + protected $dutchStopWords = array('aan', 'af', 'al', 'alles', 'als', 'altijd', 'andere', 'ben', 'bij', 'daar', 'dan', 'dat', 'de', 'der', 'deze', 'die', 'dit', 'doch', 'doen', 'door', 'doorgaans', 'dus', 'een', 'eens', 'en', 'er', 'ge', 'geen', 'geweest', 'haar', 'had', 'heb', 'hebben', 'heeft', 'hem', 'het', 'hier', 'hij', 'hoe', 'hun', 'iemand', 'iets', 'ik', 'in', 'is', 'ja', 'je', 'kan', 'kon', 'kunnen', 'maar', 'me', 'meer', 'men', 'met', 'mij', 'mijn', 'moet', 'na', 'naar', 'niet', 'niets', 'nog', 'nu', 'of', 'om', 'omdat', 'ons', 'ook', 'op', 'over', 'reeds', 'te', 'tegen', 'toch', 'toen', 'tot', 'u', 'uit', 'uw', 'van', 'veel', 'voor', 'want', 'waren', 'was', 'wat', 'we', 'wel', 'werd', 'wezen', 'wie', 'wij', 'wil', 'worden', 'zal', 'ze', 'zei', 'zelf', 'zich', 'zij', 'zijn', 'zo', 'zodat', 'zonder', 'zou'); |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * DutchStopWords constructor. |
@@ -45,18 +45,18 @@ discard block |
||
45 | 45 | if ($stmt === false) { |
46 | 46 | $errorInfo = $db->errorInfo(); |
47 | 47 | $errorMsg = $errorInfo[2]; |
48 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
48 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
49 | 49 | } |
50 | 50 | if (($stmt->execute()) === false) { |
51 | 51 | $errorInfo = $db->errorInfo(); |
52 | 52 | $errorMsg = $errorInfo[2]; |
53 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
53 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
54 | 54 | } |
55 | 55 | $uniqueFieldsPerDocument = $stmt->fetchAll(\PDO::FETCH_OBJ); |
56 | 56 | $values = array(); |
57 | 57 | $i = 0; |
58 | 58 | foreach ($uniqueFieldsPerDocument as $fieldRow) { |
59 | - $values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt(' . intval($fieldRow->termCount) . ') WHERE documentPath = ' . $db->quote($fieldRow->documentPath) . ' AND field = ' . $db->quote($fieldRow->field) . ';'; |
|
59 | + $values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt('.intval($fieldRow->termCount).') WHERE documentPath = '.$db->quote($fieldRow->documentPath).' AND field = '.$db->quote($fieldRow->field).';'; |
|
60 | 60 | $i += 1; |
61 | 61 | if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) { |
62 | 62 | $this->executeUpdateTermNorm($values, $db); |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | */ |
77 | 77 | private function executeUpdateTermNorm($values, $db) |
78 | 78 | { |
79 | - $sql = 'BEGIN TRANSACTION;' . PHP_EOL; |
|
80 | - $sql .= implode(PHP_EOL, $values) . PHP_EOL; |
|
79 | + $sql = 'BEGIN TRANSACTION;'.PHP_EOL; |
|
80 | + $sql .= implode(PHP_EOL, $values).PHP_EOL; |
|
81 | 81 | $sql .= 'COMMIT;'; |
82 | 82 | if (($db->exec($sql)) === false) { |
83 | 83 | $errorInfo = $db->errorInfo(); |
84 | 84 | $errorMsg = $errorInfo[2]; |
85 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
85 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | } |
89 | 89 | \ No newline at end of file |
@@ -47,14 +47,14 @@ |
||
47 | 47 | if (!$stmt = $db->prepare($sql)) { |
48 | 48 | $errorInfo = $db->errorInfo(); |
49 | 49 | $errorMsg = $errorInfo[2]; |
50 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
50 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
51 | 51 | } |
52 | 52 | $stmt->bindValue(':documentCount', $this->documentCount); |
53 | 53 | $result = $stmt->execute(); |
54 | 54 | if ($result === false) { |
55 | 55 | $errorInfo = $db->errorInfo(); |
56 | 56 | $errorMsg = $errorInfo[2]; |
57 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
57 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $i = 0; |
53 | 53 | foreach ($termsForDocumentField as $term) { |
54 | 54 | $frequency = intval($term->count) / $documentField->totalTermCount; |
55 | - $values[] = $quotedDocumentPath . ',' . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency); |
|
55 | + $values[] = $quotedDocumentPath.','.$quotedField.', '.$db->quote($term->term).', '.$db->quote($frequency); |
|
56 | 56 | $i += 1; |
57 | 57 | if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) { |
58 | 58 | $this->executeStore($sql, $values, $db); |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | |
102 | 102 | private function executeStore($sql, $values, $db) |
103 | 103 | { |
104 | - $sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');'; |
|
104 | + $sql .= '('.implode('),'.PHP_EOL.'(', $values).');'; |
|
105 | 105 | if (!$db->query($sql)) { |
106 | 106 | $errorInfo = $db->errorInfo(); |
107 | 107 | $errorMsg = $errorInfo[2]; |
108 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
108 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | protected function applyFilters($tokens) |
49 | 49 | { |
50 | 50 | foreach ($this->filters as $filterName) { |
51 | - $filterClassName = '\library\search\filters\\' . $filterName; |
|
51 | + $filterClassName = '\library\search\filters\\'.$filterName; |
|
52 | 52 | $filter = new $filterClassName($tokens); |
53 | 53 | $tokens = $filter->getFilterResults(); |
54 | 54 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | foreach ($documentTermCount as $field => $countArray) { |
69 | 69 | $quotedField = $db->quote($field); |
70 | 70 | foreach ($countArray as $term => $count) { |
71 | - $values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField; |
|
71 | + $values[] = $quotedDocumentPath.', '.$db->quote($term).', '.$db->quote($count).', '.$quotedField; |
|
72 | 72 | $i += 1; |
73 | 73 | if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) { |
74 | 74 | $this->executeStoreDocumentTermCount($values, $sql, $db); |
@@ -92,13 +92,13 @@ discard block |
||
92 | 92 | */ |
93 | 93 | protected function executeStoreDocumentTermCount($values, $sql, $db) |
94 | 94 | { |
95 | - $sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');'; |
|
95 | + $sql .= '('.implode('),'.PHP_EOL.'(', $values).');'; |
|
96 | 96 | |
97 | 97 | $stmt = $db->prepare($sql); |
98 | 98 | if ($stmt === false || !$stmt->execute()) { |
99 | 99 | $errorInfo = $db->errorInfo(); |
100 | 100 | $errorMsg = $errorInfo[2]; |
101 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
101 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | } |
105 | 105 | \ No newline at end of file |