X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/26b42ef92dccbff26573149d6886958862455d81..d91598a4f20dc03e12905d7c15e63bfa16116529:/writer.plp

diff --git a/writer.plp b/writer.plp
index 15a9515..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,25 +112,34 @@ my $db = eval {
 		pg_enable_utf8 => 1,
 	});
 } or Abort('Database error', 501, $@);
+$db->abstract->{array_datatypes}++;
 
-my @wordcols = (
-	lang    => 'Language',
-	cat     => 'Category',
-	ref     => undef, # included with cat
-	grade   => undef, # "
-	prio    => 'Level',
-	cover   => undef, # included with prio
-	form    => 'Title',
-	alt     => 'Synonyms',
-	wptitle => 'Wikipedia',
-	source  => 'Image',
-	thumb   => 'Convert options',
+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 => ['<span style="color:green">★</span>', 'esperanto'],
+	ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'русский'],
 );
-my @prioenum = qw( essential basic common distinctive rare invisible );
-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 => '<span style="color:green">★</span>',
+my @wordcols = pairkeys
+my %wordcol = (
+	lang    => {-label => 'Language', -select => {
+		map { $_ => "@{$lang{$_}}" } keys %lang
+	}},
+	cat     => [{-label => 'Category'}, 'ref'],
+	ref     => {-label => 'Reference'},
+	prio    => [
+		{-label => 'Level', -select => [qw(
+			essential basic common distinctive rare invisible
+		)]},
+		'cover', 'grade',
+	],
+	cover   => {-label => 'Highlighted', type => 'checkbox'},
+	grade   => {-label => 'Order', type => 'number'},
+	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 || ();
 
@@ -136,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{ pairkeys @wordcols }};
-	$_ = 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 <em>Reference</em> to <q>delete</q>."
+			);
+		}
+		else {
+			$db->delete(word => $find);
+			Alert("Entry removed");
+		}
+		next;
+	}
 
 	eval {
 		my %res = (returning => '*');
@@ -150,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;
@@ -174,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',
@@ -207,37 +273,50 @@ else {
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 
 package Shiar_Sheet::FormRow {
+	use PLP::Functions 'EscapeHTML';
+
 	sub input {
-		my ($row, $col, $type, $label) = @_;
+		my ($row, $col, $attr) = @_;
 		my $val = $row->{$col} // '';
-		$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
-		if (ref $type 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('<select id="%s" name="%1$s">', $col),
 				(map { sprintf('<option value="%s"%s>%s</option>',
-					$_, $val eq $_ && ' selected', $type->[$_]
-				) } 0 .. $#{$type}),
+					$_, $val eq $_ && ' selected', $options->{$_}
+				) } sort keys %{$options}),
 				'</select>',
 			);
 		}
-		elsif ($type eq 'checkbox') {
+		elsif ($attr->{type} eq 'checkbox') {
+			$html .= ' checked' if $val;
 			return sprintf(
 				join('',
 					'<label>',
-					'<input id="%1$s" name="%1$s" value="0" type="hidden" />',
-					'<input id="%s" name="%1$s" value="1" type="%s"%s>',
+					'<input name="%1$s" value="0" type="hidden" />',
+					'<input id="%s" name="%1$s" value="1"%s>',
 					' %s</label>',
-				), $col, $type, !!$val && ' checked', $label
+				), $col, $html, $attr->{-label}
 			);
 		}
 		else {
-			my $html = '';
-			$html .= qq( $_="$type->{$_}") for sort keys %{$type // {}};
 			return (
-				$label ? sprintf('<label for="%s">%s</label>', $col, $label) : (),
+				(map {
+					sprintf('<label for="%s">%s</label>', $col, $_)
+				} $attr->{-label} // ()),
+				ref $val ne 'ARRAY' ? () : '<span class="inline multiinput">',
+				(map {
+					sprintf('<input name="%s" value="%s" />', $col, EscapeHTML($_))
+				} ref $val eq 'ARRAY' ? @{$val} : ()),
 				sprintf('<input id="%s" name="%1$s" value="%s"%s />',
-					$col, PLP::Functions::EscapeHTML($val), $html
+					$col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html
 				),
+				ref $val ne 'ARRAY' ? () : '</span>',
 				(map {
 					sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
 						$col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
@@ -249,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;
 	}
 }
@@ -263,31 +342,36 @@ bless $row, 'Shiar_Sheet::FormRow';
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
 <ul>
 <:
-for my $colinfo (pairs @wordcols) {
-	my ($col, $title) = @{$colinfo};
-	defined $title or next;
+for my $col (@wordcols) {
+	my $info = $wordcol{$col} or next;
+	my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+	my $title = ref $attr ? delete $attr->{-label} : $attr;
 	printf '<li><label for="%s">%s</label><p>', $col, $title;
 		printf '<span class=inline>';
-	if ($col eq 'prio') {
-		print $row->input($col => \@prioenum);
-		print $row->input(cover => 'checkbox', 'Highlighted');
-		print $row->input(grade => {type => 'number'}, 'Order');
-	}
-	else {
-		print $row->input($col);
-		print $row->input(ref => {}, 'Reference') if $col eq 'cat';
-	}
+		print $row->input($col => $attr);
+		print $row->input($_ => delete $wordcol{$_}) for @span;
 		print '</span>';
 	say '</p></li>';
 }
 
-if ($row->{id}) {
-	my $children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id');
-	printf '<li><label>%s</label><div><ul class="inline">', 'Translations';
-	while (my $row = $children->hash) {
-		printf '<li><label for="%s">%s</label> <a id="%1$s" href="%s">%s</a></li>',
-			"trans-$row->{lang}", $langflag{$row->{lang}},
-			"/writer/$row->{id}", Entity($row->{form});
+if ($row->{id} and not $row->{ref}) {
+	printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
+		'trans', 'Translations';
+	my @children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
+	while (my ($lang, $val) = each %fields) {
+		$lang =~ s/^trans-// or next;
+		push @children, { lang => $lang, form => $val };
+	}
+	for my $ref (@children) {
+		printf(
+			'<li><label for="%s" title="%3$s">%s </label>',
+			"trans-$ref->{lang}", @{$lang{ $ref->{lang} }}, # flag, name
+		);
+		printf(
+			$ref->{id} ? '<a id="%s" href="%s">%s</a></li>' :
+			'<input id="%s" name="%1$s" value="%3$s" />',
+			"trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form}),
+		);
 	}
 	say '</ul></div></li>';
 }
@@ -307,12 +391,12 @@ if ($row->{id}) {
 
 <:
 say '<ul>';
-my $parents = $db->select(word => '*', {id => $row->{cat}});
+my $parents = $db->select(word => '*', [{id => $row->{cat}}, {id => $row->{ref}}]);
 while (my $ref = $parents->hash) {
 	printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
 }
 say "<li><strong>$row->{form}</strong></li>";
-my $children = $db->select(word => '*', {cat => $row->{id}}, 'grade, id');
+my $children = $db->select(word => '*', {cat => $row->{id}, ref => undef}, 'grade, id');
 while (my $ref = $children->hash) {
 	printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
 }