Helium 6 years ago
parent
commit
07f32041d5
38 changed files with 1316 additions and 300 deletions
  1. 2 2
      app/Http/Controllers/ItemPicturesController.php
  2. 4 4
      config/filesystems.php
  3. BIN
      sphinx-3.0.2/copy/dict/en.pak
  4. BIN
      sphinx-3.0.2/copy/dict/ru.pak
  5. 128 0
      sphinx-3.0.2/copy/etc/sphinx-awlex.conf
  6. 65 0
      sphinx-3.0.2/copy/etc/sphinx-min.conf.dist
  7. 1116 0
      sphinx-3.0.2/copy/etc/sphinx.conf.dist
  8. BIN
      storage/app/images/items/item_1/22zdHJbBxGDQW1LUovIR9cRh55JOZXxnGC0dfiZ2.jpeg
  9. BIN
      storage/app/images/items/item_1/874zEXsQiubYhpNPAg89FIkbFWD3hZW2ZhenvoJB.jpeg
  10. BIN
      storage/app/images/items/item_1/SzqgP2HrnGoXcVngqcRoiUd1GZED6nUlCjPy2kfi.jpeg
  11. BIN
      storage/app/images/items/item_11/3MwU4oNipT4Ti4PJ1aFFdNUxP8W4kXzKg2p54jzF.jpeg
  12. BIN
      storage/app/images/items/item_11/QPQ9iLG7b3zyGcMvWZP1qQOolmkLtEvwbaHOPpD4.jpeg
  13. BIN
      storage/app/images/items/item_11/tss3EjVnXAeVKNvVEfYIdjOd6XNfokjhpbC7o1rT.jpeg
  14. BIN
      storage/app/images/items/item_2/5o4h0RnM1T3HYRmRAoUjjrtOIk00mjSTgNWLBXcB.jpeg
  15. BIN
      storage/app/images/items/item_2/7jXFZeTeRmye310p0CGKOgCzNOOhjlNihCk0YAYo.jpeg
  16. BIN
      storage/app/images/items/item_2/ldsa7DohFifkx2opL97egxwFtDBpVQ9LUhHIVBPC.jpeg
  17. BIN
      storage/app/images/items/item_2/rcTXGcQZwfCnXSYwZYMgqdTMmm2VZc1YmeEyBDkn.jpeg
  18. BIN
      storage/app/images/items/item_3/Dzmtk2HvXisKvxVMbQptcCh4Nuavo0CDjbX2c3QE.jpeg
  19. BIN
      storage/app/images/items/item_3/F8Cd2XcCZAvOxYbt5wmwTKWVM5PeBeHkJc8gaquE.jpeg
  20. BIN
      storage/app/images/items/item_3/G9G218Rq7hhrP13zCtWoxdduT0Tltwgl4iujtw70.jpeg
  21. BIN
      storage/app/images/items/item_4/EasVr7fjaGlZEg27QB9GW7XTKRcZprEVuJBq6bVF.jpeg
  22. BIN
      storage/app/images/items/item_4/Kw0VpASepkrbp8b1d64wysmMtQgHAlABNzTeTIE2.jpeg
  23. BIN
      storage/app/images/items/item_4/LYei3CegaO90jeHoNPwqvvIIY808dQSRY6EWSbzq.jpeg
  24. BIN
      storage/app/images/items/item_5/29ks3DPuCbKKpxnRVk6nXr9PO4a80pjQhwDkgDBm.jpeg
  25. BIN
      storage/app/images/items/item_5/8JxRYIYQCwxEev2lcprwSP3VxxvbGJRcmtvdvdxA.jpeg
  26. BIN
      storage/app/images/items/item_5/fMmIT28ugwoycemGUor09IgfaQ2JDhJjtb0MeXKb.jpeg
  27. BIN
      storage/app/images/items/item_6/7Pm3icuqHJGczU3OtAo737FE4oXfKcDFmYj7Yrnk.jpeg
  28. BIN
      storage/app/images/items/item_6/9syEYDd4L651FyrsSsmMWsnmrnE3FoQ3NfZJ2hRa.jpeg
  29. BIN
      storage/app/images/items/item_6/gNAnsnmyYdY8EFipxjUyrFVBOGYu59hgPqbEsFJp.jpeg
  30. BIN
      storage/app/images/items/item_7/BHwIfe5zHwf47EVpE15Nz6nHEG8q2pgDT6J6cT8K.jpeg
  31. BIN
      storage/app/images/items/item_7/K1dLwLEZOgM9SgNFQacHUdYFa0Mf4nptpQkEUAd4.jpeg
  32. BIN
      storage/app/images/items/item_7/xhnHmVSNMHzzq0ibYluJRXnpFrzf2uqK99Ej1sI6.jpeg
  33. BIN
      storage/app/images/items/item_8/lN5nQKCc9tpJBw5LTMF0LluuEvbZNTJQGGInobpa.jpeg
  34. BIN
      storage/app/images/items/item_9/1KTvJOBrBw8Le0f1jjlZcmLRqBFqLCos7ZjcXB5D.jpeg
  35. BIN
      storage/app/images/items/item_9/j43mj3Zi3cBWZV9P4PMhUKwH25AbCEPwxnMUHVm6.jpeg
  36. BIN
      storage/app/images/items/items-default-image.jpg
  37. 0 294
      storage/awlex_dump.sql
  38. 1 0
      storage/sphinx/log/query.log

+ 2 - 2
app/Http/Controllers/ItemPicturesController.php

@@ -19,9 +19,9 @@ class ItemPicturesController extends Controller
         $path = Storage::disk($this->driver)->url($pathAfter);
         if (!File::exists($path)) {
             if ($pathAfter == 'avatar'){
-                $path = Storage::disk($this->driver)->url('users\\default-avatar.jpg');
+                $path = Storage::disk($this->driver)->url('users/default-avatar.jpg');
             }else {
-                $path = Storage::disk($this->driver)->url('items\\items-default-image.jpg');
+                $path = Storage::disk($this->driver)->url('items/items-default-image.jpg');
             }
         }
 

+ 4 - 4
config/filesystems.php

@@ -50,16 +50,16 @@ return [
 
         'public' => [
             'driver' => 'local',
-            'root' => storage_path('app\public'),
-            'url' => env('APP_URL').'/storage',
+            'root' => storage_path('app/public'),
+            'url' => storage_path('app/public'),
             'visibility' => 'public',
         ],
 
         'images' => [
             'driver' => 'local',
             'prefix' => 'items',
-            'root' => storage_path('app\\images\\'),
-            'url' => storage_path('app\\images\\'),
+            'root' => storage_path('app/images'),
+            'url' => storage_path('app/images'),
             'visibility' => 'public',
         ],
 

BIN
sphinx-3.0.2/copy/dict/en.pak


BIN
sphinx-3.0.2/copy/dict/ru.pak


+ 128 - 0
sphinx-3.0.2/copy/etc/sphinx-awlex.conf

@@ -0,0 +1,128 @@
+#
+# Minimal Sphinx configuration sample (clean, simple, functional)
+#
+
+source awlex-db
+{
+	type			    = mysql
+
+	sql_host		    = localhost
+	sql_user		    = awlex
+	sql_pass		    = VskbIskJ
+	sql_db			    = awlex
+	sql_port		    = 3306	# optional, default is 3306
+
+	sql_query_pre	    = SET NAMES utf8
+}
+
+#--------------- more detailed query ---------------------------------------
+#---------------------------------------------------------------------------
+source src_items : awlex-db
+{
+	sql_query		    = \
+		SELECT \
+		    i.id, \
+		    i.caption, \
+		    i.description, \
+		    i.category_id, \
+		    cat.title AS category, \
+		    i.subcategory_id, \
+		    subcat.title AS subcategory, \
+		    pic.path AS pictures, \
+		    i.created_at \
+		FROM items AS i \
+        JOIN categories AS cat ON cat.id = i.category_id \
+        JOIN subcategories AS subcat ON subcat.id = i.subcategory_id \
+        LEFT JOIN \
+            (SELECT item_id, GROUP_CONCAT(path SEPARATOR ", ") AS path FROM pictures GROUP BY item_id) as pic \
+        ON pic.item_id = i.id \
+        GROUP BY i.id;
+
+	sql_field_string	= caption
+	sql_field_string	= description
+	sql_attr_uint	    = category_id
+    sql_field_string	= category
+	sql_attr_uint	    = subcategory_id
+	sql_field_string	= subcategory
+	sql_field_string	= pictures
+	sql_attr_timestamp	= created_at
+
+}
+
+index items
+{
+	source			    = src_items
+	path			    = /home/awlex/public_html/awlex_site/storage/sphinx/data/items/items_index
+	#morphology          = stem_ru
+    morphology          = lemmatize_ru_all, stem_en
+	min_word_len        = 3
+	min_infix_len       = 2
+	ignore_chars        = U+AD
+    blend_chars         = +, &, U+23
+    blend_mode          = trim_tail, skip_pure
+    charset_table       = 0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+0430..U+044F, U+401->U+0435, U+451->U+0435
+}
+
+index items_rt
+{
+	type			    = rt
+	rt_mem_limit	    = 128M
+	path			    = /home/awlex/public_html/awlex_site/storage/sphinx/data/items/items_rt
+	rt_field		    = caption
+	rt_field		    = description
+	rt_attr_uint	    = subcategory_id
+}
+
+#--------------- less bud not worse ----------------------------------------
+#---------------------------------------------------------------------------
+source src_items_light : awlex-db
+{
+    sql_query		    = SELECT * FROM items
+	sql_field_string	= caption
+	sql_field_string	= description
+	sql_attr_uint	    = subcategory_id
+}
+
+index items_light : items
+{
+    source			    = src_items_light
+    path			    = /home/awlex/public_html/awlex_site/storage/sphinx/data/items_light/items_light_index
+}
+
+index items_light_rt
+{
+	type			    = rt
+	rt_mem_limit	    = 128M
+	path			    = /home/awlex/public_html/awlex_site/storage/sphinx/data/items_light/items_light_rt
+	rt_field		    = caption
+	rt_field		    = description
+	rt_attr_uint	    = subcategory_id
+}
+
+#---------------------------------------------------------------------------
+
+common {
+    lemmatizer_base     = /home/awlex/public_html/awlex_site/sphinx-3.0.2/dict
+}
+
+indexer
+{
+	mem_limit		    = 128M
+    lemmatizer_cache    = 256M # cache it all
+}
+
+searchd
+{
+	listen			    = 9312
+	listen			    = 9306:mysql41
+	log			        = /home/awlex/public_html/awlex_site/storage/sphinx/log/searchd.log
+	query_log		    = /home/awlex/public_html/awlex_site/storage/sphinx/log/query.log
+	read_timeout	    = 5
+	max_children	    = 20
+	pid_file		    = /home/awlex/public_html/awlex_site/storage/sphinx/log/searchd.pid
+	seamless_rotate	    = 1
+	preopen_indexes	    = 1
+	unlink_old		    = 1
+	workers			    = threads # for RT to work
+	binlog_path		    = /home/awlex/public_html/awlex_site/storage/sphinx/data/binlog
+}

+ 65 - 0
sphinx-3.0.2/copy/etc/sphinx-min.conf.dist

@@ -0,0 +1,65 @@
+#
+# Minimal Sphinx configuration sample (clean, simple, functional)
+#
+
+source connection
+{
+	type			= mysql
+
+	sql_host		= localhost
+	sql_user		= root
+	sql_pass		=
+	sql_db			= awlex
+	sql_port		= 3306	# optional, default is 3306
+    #sql_query_pre   = utf8
+}
+
+
+source items : connection {
+	sql_query		= \
+        SELECT id, caption, description FROM items
+
+	sql_attr_uint       = id
+	sql_field_string    = caption
+	sql_field_string    = description
+}
+
+
+index items_index {
+	source			= items
+	path			= storage/sphinx/data/items
+
+	morphology      = lemmatize_ru_all
+	ignore_chars    = U+AD
+	blend_chars     = +, &, U+23
+	blend_mode      = trim_tail, skip_pure
+	charset_table   = 0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+401->U+0435, U+451->U+0435
+	min_infix_len   = 2
+}
+
+common {
+    lemmatizer_base = sphinx-3.0.2/dict
+}
+
+indexer
+{
+	mem_limit		    = 128M
+	lemmatizer_cache    = 256M # cache it all
+}
+
+searchd
+{
+	#listen			= 127.0.0.1:9312
+	listen			= 127.0.0.1:9306:mysql41
+	log			    = storage\\sphinx\\log\\searchd.log
+	query_log		= storage\\sphinx\\log\\query.log
+	binlog_path		= storage\\sphinx\\log
+	pid_file		= storage\\sphinx\\log\\searchd.pid
+	seamless_rotate	= 1
+	preopen_indexes	= 1
+	unlink_old		= 1
+	read_timeout	= 5
+    max_children	= 10
+	workers			= threads # for RT to work
+	#client_timeout  = 3600
+}

File diff suppressed because it is too large
+ 1116 - 0
sphinx-3.0.2/copy/etc/sphinx.conf.dist


BIN
storage/app/images/items/item_1/22zdHJbBxGDQW1LUovIR9cRh55JOZXxnGC0dfiZ2.jpeg


BIN
storage/app/images/items/item_1/874zEXsQiubYhpNPAg89FIkbFWD3hZW2ZhenvoJB.jpeg


BIN
storage/app/images/items/item_1/SzqgP2HrnGoXcVngqcRoiUd1GZED6nUlCjPy2kfi.jpeg


BIN
storage/app/images/items/item_11/3MwU4oNipT4Ti4PJ1aFFdNUxP8W4kXzKg2p54jzF.jpeg


BIN
storage/app/images/items/item_11/QPQ9iLG7b3zyGcMvWZP1qQOolmkLtEvwbaHOPpD4.jpeg


BIN
storage/app/images/items/item_11/tss3EjVnXAeVKNvVEfYIdjOd6XNfokjhpbC7o1rT.jpeg


BIN
storage/app/images/items/item_2/5o4h0RnM1T3HYRmRAoUjjrtOIk00mjSTgNWLBXcB.jpeg


BIN
storage/app/images/items/item_2/7jXFZeTeRmye310p0CGKOgCzNOOhjlNihCk0YAYo.jpeg


BIN
storage/app/images/items/item_2/ldsa7DohFifkx2opL97egxwFtDBpVQ9LUhHIVBPC.jpeg


BIN
storage/app/images/items/item_2/rcTXGcQZwfCnXSYwZYMgqdTMmm2VZc1YmeEyBDkn.jpeg


BIN
storage/app/images/items/item_3/Dzmtk2HvXisKvxVMbQptcCh4Nuavo0CDjbX2c3QE.jpeg


BIN
storage/app/images/items/item_3/F8Cd2XcCZAvOxYbt5wmwTKWVM5PeBeHkJc8gaquE.jpeg


BIN
storage/app/images/items/item_3/G9G218Rq7hhrP13zCtWoxdduT0Tltwgl4iujtw70.jpeg


BIN
storage/app/images/items/item_4/EasVr7fjaGlZEg27QB9GW7XTKRcZprEVuJBq6bVF.jpeg


BIN
storage/app/images/items/item_4/Kw0VpASepkrbp8b1d64wysmMtQgHAlABNzTeTIE2.jpeg


BIN
storage/app/images/items/item_4/LYei3CegaO90jeHoNPwqvvIIY808dQSRY6EWSbzq.jpeg


BIN
storage/app/images/items/item_5/29ks3DPuCbKKpxnRVk6nXr9PO4a80pjQhwDkgDBm.jpeg


BIN
storage/app/images/items/item_5/8JxRYIYQCwxEev2lcprwSP3VxxvbGJRcmtvdvdxA.jpeg


BIN
storage/app/images/items/item_5/fMmIT28ugwoycemGUor09IgfaQ2JDhJjtb0MeXKb.jpeg


BIN
storage/app/images/items/item_6/7Pm3icuqHJGczU3OtAo737FE4oXfKcDFmYj7Yrnk.jpeg


BIN
storage/app/images/items/item_6/9syEYDd4L651FyrsSsmMWsnmrnE3FoQ3NfZJ2hRa.jpeg


BIN
storage/app/images/items/item_6/gNAnsnmyYdY8EFipxjUyrFVBOGYu59hgPqbEsFJp.jpeg


BIN
storage/app/images/items/item_7/BHwIfe5zHwf47EVpE15Nz6nHEG8q2pgDT6J6cT8K.jpeg


BIN
storage/app/images/items/item_7/K1dLwLEZOgM9SgNFQacHUdYFa0Mf4nptpQkEUAd4.jpeg


BIN
storage/app/images/items/item_7/xhnHmVSNMHzzq0ibYluJRXnpFrzf2uqK99Ej1sI6.jpeg


BIN
storage/app/images/items/item_8/lN5nQKCc9tpJBw5LTMF0LluuEvbZNTJQGGInobpa.jpeg


BIN
storage/app/images/items/item_9/1KTvJOBrBw8Le0f1jjlZcmLRqBFqLCos7ZjcXB5D.jpeg


BIN
storage/app/images/items/item_9/j43mj3Zi3cBWZV9P4PMhUKwH25AbCEPwxnMUHVm6.jpeg


BIN
storage/app/images/items/items-default-image.jpg


File diff suppressed because it is too large
+ 0 - 294
storage/awlex_dump.sql


+ 1 - 0
storage/sphinx/log/query.log

@@ -0,0 +1 @@
+[Tue Apr 24 01:31:33.607 2018] 0.293 sec 0.293 sec [ext2/0/ext 1 (0,20)] [items_light] (@(caption,description) *кот*)