summaryrefslogtreecommitdiff
path: root/app/Http/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/Http/Controllers')
-rw-r--r--app/Http/Controllers/RSSController.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/Http/Controllers/RSSController.php b/app/Http/Controllers/RSSController.php
index 5d23b65..a75371c 100644
--- a/app/Http/Controllers/RSSController.php
+++ b/app/Http/Controllers/RSSController.php
@@ -64,10 +64,17 @@ class RSSController extends Controller {
$query = $request->get("q");
$q = "%" . Utility::escapeLike($query) . "%";
$data = DB::table('all_view')->whereNotNull('url')->where('name', 'like', $q)->orWhere('spirit_type', 'like', $q)->orderBy($sort_by, $order_by)->limit(20)->get();
- } else {
+ } else if ( "" != $request->get('type') ) {
$data = DB::table('all_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
+ } else if ( "" != $request->get('shop') ) {
+ $data = DB::table('all_view')->where('shop', '=', $request->get('shop'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
+ } else {
+ $view_name = 'all'; // empty search will be processed in the next step
}
- } else {
+ }
+
+ // either empty search or generic feed
+ if ( !isset($data) ) {
$data = DB::table($view_name . '_view')->where('procent', '>=', 10)->orderBy($sort_by, $order_by)->limit(20)->get();
}