diff options
| -rw-r--r-- | elm/AdvSearch/Fields.elm | 1 | ||||
| -rw-r--r-- | elm/ReleaseEdit.elm | 4 | ||||
| -rw-r--r-- | lib/VNWeb/AdvSearch.pm | 1 | ||||
| -rw-r--r-- | lib/VNWeb/Releases/Lib.pm | 2 | ||||
| -rw-r--r-- | lib/VNWeb/Releases/Page.pm | 4 | ||||
| -rw-r--r-- | lib/VNWeb/Releases/VNTab.pm | 4 | ||||
| -rw-r--r-- | sql/schema.sql | 2 |
7 files changed, 5 insertions, 13 deletions
diff --git a/elm/AdvSearch/Fields.elm b/elm/AdvSearch/Fields.elm index 1e80b45b..6c90a4f4 100644 --- a/elm/AdvSearch/Fields.elm +++ b/elm/AdvSearch/Fields.elm @@ -431,7 +431,6 @@ fields = , f R "Type" 3 FMRType AS.init AS.rtypeFromQuery , l R "Patch" 0 [(QInt 61 Eq 1, "Patch to another release"),(QInt 61 Ne 1, "Standalone release")] , l R "Freeware" 0 [(QInt 62 Eq 1, "Freeware"), (QInt 62 Ne 1, "Non-free")] - , l R "Self-published" 0 [(QInt 63 Eq 1, "Self-published"), (QInt 63 Ne 1, "Commercially published")] , l R "Uncensored" 0 [(QInt 64 Eq 1, "Uncensored (no mosaic)"), (QInt 64 Ne 1, "Censored (or no erotic content to censor)")] , l R "Official" 0 [(QInt 65 Eq 1, "Official"), (QInt 65 Ne 1, "Unofficial")] , f R "Developer" 0 FMDeveloper AP.init (AP.fromQuery False) diff --git a/elm/ReleaseEdit.elm b/elm/ReleaseEdit.elm index d4fa6d94..54a2297e 100644 --- a/elm/ReleaseEdit.elm +++ b/elm/ReleaseEdit.elm @@ -161,7 +161,6 @@ type Msg | Official Bool | Patch Bool | Freeware Bool - | Doujin Bool | Lang Int String | LangMtl Int Bool | LangDel Int @@ -202,7 +201,6 @@ update msg model = Official b -> ({ model | official = b }, Cmd.none) Patch b -> ({ model | patch = b }, Cmd.none) Freeware b -> ({ model | freeware = b }, Cmd.none) - Doujin b -> ({ model | doujin = b }, Cmd.none) Lang n s -> ({ model | lang = if s /= "" && n == List.length model.lang then model.lang ++ [{lang=s, mtl=False}] else modidx n (\l -> { l | lang = s }) model.lang }, Cmd.none) LangMtl n b-> ({ model | lang = modidx n (\l -> { l | mtl = b }) model.lang }, Cmd.none) LangDel n -> ({ model | lang = delidx n model.lang }, Cmd.none) @@ -302,8 +300,6 @@ viewGen model = , formField "" [ label [] [ inputCheck "" model.official Official, text " Official (i.e. sanctioned by the original developer of the visual novel)" ] ] , formField "" [ label [] [ inputCheck "" model.patch Patch , text " This release is a patch to another release.", text " (*)" ] ] , formField "" [ label [] [ inputCheck "" model.freeware Freeware, text " Freeware (i.e. available at no cost)" ] ] - , if model.patch then text "" else - formField "" [ label [] [ inputCheck "" model.doujin Doujin , text " Doujin (self-published, not by a company)" ] ] , formField "Release date" [ D.view model.released False False Released, text " Leave month or day blank if they are unknown." ] , tr [ class "newpart" ] [ td [ colspan 2 ] [ text "Format" ] ] diff --git a/lib/VNWeb/AdvSearch.pm b/lib/VNWeb/AdvSearch.pm index 9acf9761..6c8474cf 100644 --- a/lib/VNWeb/AdvSearch.pm +++ b/lib/VNWeb/AdvSearch.pm @@ -386,6 +386,7 @@ f r => 18 => 'rlist', { uint => 1, enum => \%RLIST_STATUS }, sql_list => sub }; f r => 61 => 'patch', { uint => 1, range => [1,1] }, '=' => sub { 'r.patch' }; f r => 62 => 'freeware', { uint => 1, range => [1,1] }, '=' => sub { 'r.freeware' }; +# TODO: This flag has been deprecated, replace with a subquery that checks the publisher instead? f r => 63 => 'doujin', { uint => 1, range => [1,1] }, '=' => sub { 'r.doujin' }; f r => 64 => 'uncensored',{uint => 1, range => [1,1] }, '=' => sub { 'r.uncensored' }; f r => 65 => 'official', { uint => 1, range => [1,1] }, '=' => sub { 'r.official' }; diff --git a/lib/VNWeb/Releases/Lib.pm b/lib/VNWeb/Releases/Lib.pm index e5e46846..6f9bafe8 100644 --- a/lib/VNWeb/Releases/Lib.pm +++ b/lib/VNWeb/Releases/Lib.pm @@ -92,8 +92,6 @@ sub release_row_ { icon_ 'ero_animated', "Ero: $ANIMATED{$r->{ani_ero}}{txt}", "anim$r->{ani_ero}" if $r->{ani_ero}; icon_ 'free', 'Freeware' if $r->{freeware}; icon_ 'nonfree', 'Non-free' if !$r->{freeware}; - icon_ 'doujin', 'Doujin' if !$r->{patch} && $r->{doujin}; - icon_ 'commercial', 'Commercial' if !$r->{patch} && !$r->{doujin}; if($r->{reso_y}) { my $ratio = $r->{reso_x} / $r->{reso_y}; my $type = $ratio == 4/3 ? '4-3' : $ratio == 16/9 ? '16-9' : 'custom'; diff --git a/lib/VNWeb/Releases/Page.pm b/lib/VNWeb/Releases/Page.pm index 49374167..7a83b149 100644 --- a/lib/VNWeb/Releases/Page.pm +++ b/lib/VNWeb/Releases/Page.pm @@ -105,9 +105,7 @@ sub _infotable_ { tr_ sub { td_ 'Publication'; - td_ join ', ', - $r->{freeware} ? 'Freeware' : 'Non-free', - $r->{patch} ? () : ($r->{doujin} ? 'doujin' : 'commercial'); + td_ $r->{freeware} ? 'Freeware' : 'Non-free'; }; tr_ sub { diff --git a/lib/VNWeb/Releases/VNTab.pm b/lib/VNWeb/Releases/VNTab.pm index a35f0d6c..a606827e 100644 --- a/lib/VNWeb/Releases/VNTab.pm +++ b/lib/VNWeb/Releases/VNTab.pm @@ -47,12 +47,12 @@ my @rel_cols = ( }, { # Publication id => 'pub', sort_field => 'publication', - sort_sql => 'r.doujin %s, r.freeware %1$s, r.patch %1$s, r.released %1$s, r.title %1$s', + sort_sql => 'r.freeware %1$s, r.patch %1$s, r.released %1$s, r.title %1$s', column_string => 'Publication', column_width => 70, button_string => 'Publication', default => 1, - draw => sub { txt_ join ', ', $_[0]{freeware} ? 'Freeware' : 'Non-free', $_[0]{patch} ? () : ($_[0]{doujin} ? 'doujin' : 'commercial') }, + draw => sub { txt_ $_[0]{freeware} ? 'Freeware' : 'Non-free' }, }, { # Platforms id => 'pla', button_string => 'Platforms', diff --git a/sql/schema.sql b/sql/schema.sql index eef5203c..2e0b0b3f 100644 --- a/sql/schema.sql +++ b/sql/schema.sql @@ -368,7 +368,7 @@ CREATE TABLE releases ( -- dbentry_type=r reso_y smallint NOT NULL DEFAULT 0, -- [pub] patch boolean NOT NULL DEFAULT FALSE, -- [pub] freeware boolean NOT NULL DEFAULT FALSE, -- [pub] - doujin boolean NOT NULL DEFAULT FALSE, -- [pub] + doujin boolean NOT NULL DEFAULT FALSE, -- [pub] (deprecated) uncensored boolean NOT NULL DEFAULT FALSE, -- [pub] official boolean NOT NULL DEFAULT TRUE, -- [pub] locked boolean NOT NULL DEFAULT FALSE, |