X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/c6d80876bdce00b6e71600f83b58e0afcb481495..e24a09c638a103745a9b7b7e557d3222de2d1275:/writer.plp

diff --git a/writer.plp b/writer.plp
index 7cbe9e6..84dc4a8 100644
--- a/writer.plp
+++ b/writer.plp
@@ -13,18 +13,12 @@ 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 {
+	my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?<!^)/.+}{}r;
 	if (defined $post{username}) {
 		$cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
 	}
@@ -33,7 +27,7 @@ my $user = eval {
 		if (AddCookie(CGI::Cookie->new(
 			-name    => 'login',
 			-value   => '',
-			-path    => '/writer',
+			-path    => $rootpath,
 			-expires => 'now',
 		)->as_string)) {
 			delete $cookie{login};
@@ -53,7 +47,7 @@ my $user = eval {
 		my $httpcookie = CGI::Cookie->new(
 			-name    => 'login',
 			-value   => join(':', @{$found}{qw( username pass )}),
-			-path    => '/writer',
+			-path    => $rootpath,
 		) or die "prepared object is empty\n";
 		AddCookie($httpcookie->as_string);
 	} or Abort(["Unable to create login cookie", $@], 403);
@@ -78,6 +72,7 @@ my %lang = (
 	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}", 'русский'],
+	la => ["\N{PUSHPIN}", 'latin'],
 );
 my @wordcols = pairkeys
 my %wordcol = (
@@ -105,8 +100,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
@@ -167,6 +174,7 @@ elsif (defined $post{form}) {{
 				prio  => undef,
 			);
 			$subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+			$subrow{alt} = [split m{/}, $1] if $subrow{form} =~ s{/(\S.*)}{}; # /alternates shorthand
 			$db->insert(word => \%subrow);
 			delete $fields{$field};
 		}
@@ -214,7 +222,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',