X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/ae4ac683abb8a60d182b948bf7b5b6b31a729975..3d85617a93a26670c13f346c1432a6f417e2e603:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index b549917..05e1465 100644
--- a/writer.plp
+++ b/writer.plp
@@ -5,98 +5,7 @@ Html({
version => '1.0',
nocache => 1,
raw => <<'EOT',
-
-
+
EOT
});
@@ -104,16 +13,9 @@ EOT
use List::Util qw( pairs pairkeys );
my $db = eval {
- my @dbinfo = (
- 'DBI:Pg:dbname=sheet;host=localhost', 'sheetadmin', 'fairuse',
- ) or die "database not configured\n";
- require DBIx::Simple;
- DBIx::Simple->new(@dbinfo[0..2], {
- RaiseError => 1,
- pg_enable_utf8 => 1,
- });
+ require Shiar_Sheet::DB;
+ Shiar_Sheet::DB->connect;
} or Abort('Database error', 501, $@);
-$db->abstract->{array_datatypes}++;
my $user = eval {
if (defined $post{username}) {
@@ -178,9 +80,14 @@ my %wordcol = (
cat => [{-label => 'Category'}, 'ref'],
ref => {-label => 'Reference'},
prio => [
- {-label => 'Level', -select => [qw(
- essential basic common distinctive rare invisible
- )]},
+ {-label => 'Level', -select => sub {
+ my ($row) = @_;
+ my @enum = qw[ essential basic common distinctive optional invisible ];
+ return {
+ ('' => 'parent') x (defined $row->{ref}),
+ map { $_ => $enum[$_] } 0 .. $#enum
+ };
+ }},
'cover', 'grade',
],
cover => {-label => 'Highlighted', type => 'checkbox'},
@@ -191,8 +98,20 @@ my %wordcol = (
source => {-label => 'Image'},
thumb => {-label => 'Convert options', -multiple => 1},
);
-my ($find) = map {{id => $_}} $fields{id} || $Request || ();
+if (my $search = $fields{q}) {
+ my %filter = (form => {ilike => '%'.$search.'%'});
+ my $results = $db->select(word => '*', \%filter);
+ say '
Search ';
+ printf("%s %s %s \n",
+ $_->{id}, showlink($_->{form}, "/writer/$_->{id}"),
+ sprintf(' ', Shiar_Sheet::FormRow::imagepath($_ => 'thumb')) x defined $_->{thumb}
+ ) for $results->hashes;
+ say " \n";
+ exit;
+}
+
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
if ($find) {
$row = $db->select(word => '*', $find)->hash
@@ -250,6 +169,7 @@ elsif (defined $post{form}) {{
ref => $row->{id},
lang => $lang,
form => $val,
+ prio => undef,
);
$subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
$db->insert(word => \%subrow);
@@ -297,12 +217,13 @@ elsif (defined $post{form}) {{
}
@cmds = (
'convert',
+ $imgpath,
-delete => '1--1', -background => 'white',
- -gravity => @cmds ? 'northwest' : 'center',
+ -gravity => defined $row->{thumb} ? 'northwest' : 'center',
@cmds,
-resize => "$xyres^", -extent => $xyres,
'-strip', -quality => '60%', -interlace => 'plane',
- $imgpath => $thumbpath
+ $thumbpath
);
eval {
require IPC::Run;
@@ -321,9 +242,9 @@ elsif (defined $post{form}) {{
}
}}
else {
- $row->{prio} //= 1;
$row->{lang} //= $user->{editlang}->[0];
$row->{$_} = $get{$_} for keys %get;
+ $row->{prio} = defined $row->{ref} ? undef : 1 unless exists $row->{prio};
}
my $title = $row->{id} ? "entry #$row->{id} " : 'new entry';
@@ -338,8 +259,7 @@ package Shiar_Sheet::FormRow {
$html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
if (my $options = $attr->{-select}) {
- $options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
- if ref $options eq 'ARRAY';
+ $options = $options->(@_) if ref $options eq 'CODE';
$options->{$val} //= "unknown ($val)"; # preserve current
return (
sprintf('', $col),
@@ -385,7 +305,7 @@ package Shiar_Sheet::FormRow {
sub imagepath {
my ($row, $col) = @_;
return "data/word/org/$row->{id}.jpg" if $col eq 'source';
- return "data/word/en/$row->{form}.jpg" if $col eq 'thumb';
+ return "data/word/en/$row->{id}.jpg" if $col eq 'thumb';
return;
}
}