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

diff --git a/writer.plp b/writer.plp
index 7280142..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,6 +112,7 @@ 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'],
@@ -127,10 +136,10 @@ my %wordcol = (
 	cover   => {-label => 'Highlighted', type => 'checkbox'},
 	grade   => {-label => 'Order', type => 'number'},
 	form    => {-label => 'Title'},
-	alt     => {-label => 'Synonyms'},
+	alt     => {-label => 'Synonyms', -multiple => 1},
 	wptitle => {-label => 'Wikipedia'},
 	source  => {-label => 'Image'},
-	thumb   => {-label => 'Convert options'},
+	thumb   => {-label => 'Convert options', -multiple => 1},
 );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
@@ -144,9 +153,18 @@ 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') {
@@ -178,8 +196,8 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 			$db->insert(word => {
 				ref   => $row->{id},
 				lang  => $lang,
-				form  => $val,
-			});
+				form  => $_,
+			}) for parseinput($val);
 			delete $fields{$field};
 		}
 		return 1;
@@ -255,10 +273,11 @@ 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, $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 // {}};
 
@@ -290,9 +309,14 @@ package Shiar_Sheet::FormRow {
 				(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' : '';