X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/9549abd0dfa94f05c136da03cd1bc8103ae66838..9ddf2e9a6173fcb1649ab9dd72ded3896195c83f:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index 4df6f8c..256a074 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}) {
@@ -169,6 +71,7 @@ my %lang = (
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}", 'ÑÑÑÑкий'],
+ la => ["\N{PUSHPIN}", 'latin'],
);
my @wordcols = pairkeys
my %wordcol = (
@@ -178,9 +81,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 +99,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 "