word edit: apply image gravity for empty conversion array

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index 493f74534b3f5961253b6b4fe224a4e5451363fc..05e14659e3fb2769ec44d08a6776f675509e4978 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -98,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 '<h1>Search</h1><ul>';
+       printf("<li><small>%s</small> %s %s</li>\n",
+               $_->{id}, showlink($_->{form}, "/writer/$_->{id}"),
+               sprintf('<img src="/%s" style="height:3ex; width:auto" />', Shiar_Sheet::FormRow::imagepath($_ => 'thumb')) x defined $_->{thumb}
+       ) for $results->hashes;
+       say "</ul>\n";
+       exit;
+}
+
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 my $row;
 if ($find) {
        $row = $db->select(word => '*', $find)->hash
@@ -207,7 +219,7 @@ elsif (defined $post{form}) {{
                                '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',