Fix SPARQL query & not found judge

Assault-Lily · May 1, 2021 · f8b4825 · f8b4825
1 parent f0c9757
commit f8b4825
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
@@ -60,7 +60,7 @@ public function show($bookSlug){
 );
         $sparqlArray = sparqlToArray($sparql);
 
-        if(count($sparqlArray) === 0) abort(404, '該当する書籍のデータが存在しません');
+        if(empty($sparqlArray) || empty($sparqlArray['lilyrdf:'.$bookSlug])) abort(404, '該当する書籍のデータが存在しません');
 
         $book = array();
         $lilies = array();

diff --git a/app/Http/Controllers/LegionController.php b/app/Http/Controllers/LegionController.php
@@ -70,7 +70,7 @@ public function show($legionSlug){
 
         $legion = sparqlToArray($legion_sparql);
 
-        if (empty($legion)) abort(404, "指定されたレギオンのデータは現時点で存在しません");
+        if (empty($legion) || empty($legion['lilyrdf:'.$legionSlug])) abort(404, "指定されたレギオンのデータは現時点で存在しません");
 
         $icons = array();
         foreach (Image::whereType('icon')->get() as $icon){

diff --git a/app/Http/Controllers/LilyController.php b/app/Http/Controllers/LilyController.php
@@ -229,7 +229,8 @@ public function show(string $slug)
 SELECT ?subject ?predicate ?object
 WHERE {
   {
-    lilyrdf:$slug ?predicate ?object.
+    lilyrdf:$slug a lily:Lily;
+                  ?predicate ?object.
     BIND(lilyrdf:$slug AS ?subject)
   }
   UNION
@@ -268,7 +269,7 @@ public function show(string $slug)
 );
         $triples = sparqlToArray($triples_sparql);
 
-        if(empty($triples)) abort(404, '該当するリリィのデータが存在しません');
+        if(empty($triples) || empty($triples['lilyrdf:'.$slug])) abort(404, '該当するリリィのデータが存在しません');
 
         $triples_model = Triple::whereLilySlug($slug)->get();
         foreach ($triples_model as $triple){