X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/aaa2eeaf33cba2bb71d03d21bccc5d87c34f0b88..d91598a4f20dc03e12905d7c15e63bfa16116529:/writer.plp
diff --git a/writer.plp b/writer.plp
index 0e10582..d716754 100644
--- a/writer.plp
+++ b/writer.plp
@@ -28,7 +28,7 @@ form > ul > li > label {
}
form > ul > li > label + * {
/* td */
- width: 32em;
+ width: 40em;
}
input,select {
@@ -48,6 +48,7 @@ select {
#thumbpreview {
width: 300px;
align-self: start;
+ flex-shrink: 0;
}
ul.popup {
@@ -78,6 +79,13 @@ h1 {
}
.inline .inline {
display: flex;
+ margin: 0;
+}
+.inline.multiinput {
+ flex-wrap: wrap;
+}
+.multiinput > input {
+ width: 10em;
}
#nav > ul,
@@ -104,10 +112,19 @@ my $db = eval {
pg_enable_utf8 => 1,
});
} or Abort('Database error', 501, $@);
+$db->abstract->{array_datatypes}++;
+my %lang = (
+ nl => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'nederlands'],
+ en => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
+ eo => ['â
', 'esperanto'],
+ ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'ÑÑÑÑкий'],
+);
my @wordcols = pairkeys
my %wordcol = (
- lang => 'Language',
+ lang => {-label => 'Language', -select => {
+ map { $_ => "@{$lang{$_}}" } keys %lang
+ }},
cat => [{-label => 'Category'}, 'ref'],
ref => {-label => 'Reference'},
prio => [
@@ -118,16 +135,11 @@ my %wordcol = (
],
cover => {-label => 'Highlighted', type => 'checkbox'},
grade => {-label => 'Order', type => 'number'},
- form => 'Title',
- alt => 'Synonyms',
- wptitle => 'Wikipedia',
- source => 'Image',
- thumb => 'Convert options',
-);
-my %langflag = (
- nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}",
- eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}",
- epo => 'â
',
+ form => {-label => 'Title'},
+ alt => {-label => 'Synonyms', -multiple => 1},
+ wptitle => {-label => 'Wikipedia'},
+ source => {-label => 'Image'},
+ thumb => {-label => 'Convert options', -multiple => 1},
);
my ($find) = map {{id => $_}} $fields{id} || $Request || ();
@@ -141,9 +153,31 @@ if (exists $get{copy}) {
$row = {%{$row}{ qw(prio lang cat) }};
}
elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
+ sub parseinput {
+ return if not length $_[0];
+ require Encode;
+ return Encode::decode_utf8($_[0]);
+ }
+
my $replace = $row;
- $row = {%post{keys %wordcol}};
- $_ = length ? $_ : undef for values %{$row};
+ $row = {map { $_ =>
+ ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ?
+ [ map { parseinput($_) } $post{'@'.$_}->@* ] :
+ scalar parseinput($post{$_})
+ } keys %wordcol};
+
+ if (!$row->{form}) {
+ if ($row->{ref} ne 'delete') {
+ Alert("Empty title",
+ "Confirm removal by setting Reference to delete
."
+ );
+ }
+ else {
+ $db->delete(word => $find);
+ Alert("Entry removed");
+ }
+ next;
+ }
eval {
my %res = (returning => '*');
@@ -155,6 +189,20 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
next;
};
+ eval {
+ while (my ($lang, $val) = each %post) {
+ my $field = $lang;
+ $lang =~ s/^trans-// or next;
+ $db->insert(word => {
+ ref => $row->{id},
+ lang => $lang,
+ form => $_,
+ }) for parseinput($val);
+ delete $fields{$field};
+ }
+ return 1;
+ } or Alert('Error creating translation entries', $@);
+
my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
my $reimage = eval {
($row->{source} // '') ne ($replace->{source} // '') or return;
@@ -179,6 +227,19 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
if (-e $imgpath) {
my $xyres = $row->{cover} ? '600x400' : '300x200';
my @cmds = @{ $row->{thumb} // [] };
+ if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) {
+ # replace option by permillage crop
+ my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1];
+ splice @cmds, $cmdarg, 2, (
+ -set => 'option:distort:viewport' => sprintf(
+ '%%[fx:w*%s]x%%[fx:h*%s]+%%[fx:w*%s]+%%[fx:h*%s]',
+ ($dim[2] || 1) - $dim[0], # width = x2 - x1
+ ($dim[3] || 1) - $dim[1], # height = y2 - y1
+ @dim[0, 1] # offset = x1,y1
+ ),
+ -distort => SRT => 0, # noop transform to apply viewport
+ );
+ }
@cmds = (
'convert',
-delete => '1--1', -background => 'white',
@@ -212,19 +273,23 @@ else {
my $title = $row->{id} ? "entry #$row->{id}" : 'new entry';
package Shiar_Sheet::FormRow {
+ use PLP::Functions 'EscapeHTML';
+
sub input {
my ($row, $col, $attr) = @_;
my $val = $row->{$col} // '';
- $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
my $html = '';
$html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
if (my $options = $attr->{-select}) {
+ $options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
+ if ref $options eq 'ARRAY';
+ $options->{$val} //= "unknown ($val)"; # preserve current
return (
sprintf('',
);
}
@@ -244,9 +309,14 @@ package Shiar_Sheet::FormRow {
(map {
sprintf('', $col, $_)
} $attr->{-label} // ()),
+ ref $val ne 'ARRAY' ? () : '',
+ (map {
+ sprintf('', $col, EscapeHTML($_))
+ } ref $val eq 'ARRAY' ? @{$val} : ()),
sprintf('',
- $col, PLP::Functions::EscapeHTML($val), $html
+ $col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html
),
+ ref $val ne 'ARRAY' ? () : '',
(map {
sprintf '',
$col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
@@ -258,7 +328,7 @@ package Shiar_Sheet::FormRow {
sub imagepath {
my ($row, $col) = @_;
return "data/word/org/$row->{id}.jpg" if $col eq 'source';
- return "data/word/eng/$row->{form}.jpg" if $col eq 'thumb';
+ return "data/word/en/$row->{form}.jpg" if $col eq 'thumb';
return;
}
}
@@ -284,13 +354,24 @@ for my $col (@wordcols) {
say '