From 604e0a06acc2a92c42003150d4fdea688b01fba5 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Thu, 31 Dec 2015 23:37:16 +0100
Subject: DB::Releases: Don't match non-patch fields for patch releases

Fixes https://vndb.org/t950.210
---
 lib/VNDB/DB/Releases.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/VNDB')

diff --git a/lib/VNDB/DB/Releases.pm b/lib/VNDB/DB/Releases.pm
index ecec63aa..1c262074 100644
--- a/lib/VNDB/DB/Releases.pm
+++ b/lib/VNDB/DB/Releases.pm
@@ -18,15 +18,15 @@ sub dbReleaseFilters {
   return (
     defined $o{patch}       ? ( 'r.patch = ?'      => $o{patch}    == 1 ? 1 : 0) : (),
     defined $o{freeware}    ? ( 'r.freeware = ?'   => $o{freeware} == 1 ? 1 : 0) : (),
-    defined $o{doujin}      ? ( 'r.doujin = ?'     => $o{doujin}   == 1 ? 1 : 0) : (),
     defined $o{type}        ? ( 'r.type = ?'       => $o{type} ) : (),
     defined $o{date_before} ? ( 'r.released <= ?'  => $o{date_before} ) : (),
     defined $o{date_after}  ? ( 'r.released >= ?'  => $o{date_after} ) : (),
-    defined $o{minage}      ? ( 'r.minage IN(!l)'     => [ ref $o{minage}     ? $o{minage}     : [$o{minage}]     ] ) : (),
-    defined $o{resolution}  ? ( 'r.resolution IN(!l)' => [ ref $o{resolution} ? $o{resolution} : [$o{resolution}] ] ) : (),
-    defined $o{voiced}      ? ( 'r.voiced IN(!l)'     => [ ref $o{voiced}     ? $o{voiced}     : [$o{voiced}]     ] ) : (),
-    defined $o{ani_story}   ? ( 'r.ani_story IN(!l)'  => [ ref $o{ani_story}  ? $o{ani_story}  : [$o{ani_story}]  ] ) : (),
-    defined $o{ani_ero}     ? ( 'r.ani_ero IN(!l)'    => [ ref $o{ani_ero}    ? $o{ani_ero}    : [$o{ani_ero}]    ] ) : (),
+    defined $o{minage}      ? ( 'r.minage IN(!l)'  => [ ref $o{minage}     ? $o{minage}     : [$o{minage}]     ] ) : (),
+    defined $o{doujin}      ? ( 'NOT r.patch AND r.doujin = ?'        => $o{doujin} == 1 ? 1 : 0) : (),
+    defined $o{resolution}  ? ( 'NOT r.patch AND r.resolution IN(!l)' => [ ref $o{resolution} ? $o{resolution} : [$o{resolution}] ] ) : (),
+    defined $o{voiced}      ? ( 'NOT r.patch AND r.voiced IN(!l)'     => [ ref $o{voiced}     ? $o{voiced}     : [$o{voiced}]     ] ) : (),
+    defined $o{ani_story}   ? ( 'NOT r.patch AND r.ani_story IN(!l)'  => [ ref $o{ani_story}  ? $o{ani_story}  : [$o{ani_story}]  ] ) : (),
+    defined $o{ani_ero}     ? ( 'NOT r.patch AND r.ani_ero IN(!l)'    => [ ref $o{ani_ero}    ? $o{ani_ero}    : [$o{ani_ero}]    ] ) : (),
     defined $o{released}    ? ( 'r.released !s ?'  => [ $o{released} ? '<=' : '>', strftime('%Y%m%d', gmtime) ] ) : (),
     $o{lang} ? (
       'r.id IN(SELECT irl.id FROM releases_lang irl WHERE irl.lang IN(!l))' => [ ref $o{lang} ? $o{lang} : [ $o{lang} ] ] ) : (),
-- 
cgit v1.2.3