visuddhinanda пре 2 година
родитељ
комит
c28f290f03
1 измењених фајлова са 11 додато и 4 уклоњено
  1. 11 4
      app/Http/Controllers/SearchController.php

+ 11 - 4
app/Http/Controllers/SearchController.php

@@ -16,6 +16,7 @@ use App\Http\Resources\SearchBookResource;
 use Illuminate\Support\Facades\Log;
 use App\Tools\Tools;
 use App\Models\WbwTemplate;
+use App\Models\PageNumber;
 
 
 class SearchController extends Controller
@@ -189,16 +190,22 @@ class SearchController extends Controller
             }
         }
 
-//type='.ctl.' and word like 'P%038'
         $key = $request->get('key');
         $searchKey = '';
-        $table = WbwTemplate::where('type','.ctl.');
         if(is_numeric($key)){
-            $table = $table->where('word','like',$request->get('type')."%0".$key);
+            $table = PageNumber::where('type',$request->get('type'))->where('page',$key);
         }else{
-            $table = $table->where('word',$key);
+            $page = explode('.',$key);
+            if(count($page)===2){
+                $table = PageNumber::where('type',$request->get('type'))
+                                   ->where('volume',$page[0])
+                                   ->where('page',$page[1]);
+            }else{
+                $table = PageNumber::where('type',$request->get('type'))->where('page',$key);
+            }
         }
 
+
         if(count($bookId)>0){
             $table = $table->whereIn('pcd_book_id',$bookId);
         }