X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fqtextstring;h=6872e7ecdd449c353a6828dd5807462d62f7808f;hp=e046c56c3d4f90c7fe4b3034836015ca64e73879;hb=ea3cffe854b1c540bc68cd2218fdb2be732197fa;hpb=6302552bfa5844eddb7c26386c9995733f0a5174

diff --git a/yarrg/web/qtextstring b/yarrg/web/qtextstring
index e046c56..6872e7e 100644
--- a/yarrg/web/qtextstring
+++ b/yarrg/web/qtextstring
@@ -39,24 +39,27 @@
 $qa => $m->caller_args(1)->{'qa'}
 $dbh
 $thingstring
+$checkkind => undef
 $emsgstore
 $onresults
-$prefix => 'ts';
-$helpref => undef;
+$boxopts => 'size=10'
+$prefix => 'ts'
+$helpref => undef
 </%args>
 <%perl>
 my $stringval= $qa->{$thingstring};
 $stringval='' if !defined $stringval;
+$checkkind= $thingstring if !defined $checkkind;
 
 my $p= $prefix.'_';
-my $checker= $m->fetch_comp("check_${thingstring}");
+my $checker= $m->fetch_comp("check_${checkkind}");
 my $significant_nonempty= $checker->attr_exists('significant_nonempty');
 
 </%perl>
 
 <&| script &>
 <%$p%>uri= "qtextstringcheck?format=application/json&ctype=text/xml"
-		+ "&what=<% $thingstring %>"
+		+ "&what=<% $checkkind %>"
 		+ "&ocean=<% uri_escape($qa->{Ocean}) %>";
 
 <%$p%>timeout=false;
@@ -97,24 +100,13 @@ function <%$p%>Ready() {
 register_onload(<%$p%>Needed);
 </&script>
 
-% if (!printable($m)) {
-<input type="text" <% $m->content %>
- id="<% $thingstring %>" name="<% $thingstring %>"
- onchange="<%$p%>Needed();" onkeyup="<%$p%>Later();"
- value="<% $stringval |h %>"
- ><% defined($helpref) ? "<a href=\"docs#$helpref\">[?]</a>" : '' %>
-<br>
-<div id="<%$p%>results">&nbsp;</div><br>
-% } else {
-<kbd><strong><% $stringval |h %></strong></kbd>
-<br>
-<br>
-% }
-
 <%perl>
+my ($canonstring);
+
 if ($significant_nonempty || length $thingstring) {
-	my ($emsg,$canonstring,@results)= $m->comp('qtextstringcheck',
-		what => $thingstring,
+	my ($emsg,@results);
+	($emsg,$canonstring,@results)= $m->comp('qtextstringcheck',
+		what => $checkkind,
 		ocean => $qa->{Ocean},
 		string => $stringval,
 		format => 'return'
@@ -126,3 +118,18 @@ if ($significant_nonempty || length $thingstring) {
 	$onresults->(@results);
 }
 </%perl>
+
+% if (!printable($m)) {
+<input type="text" <% $boxopts %>
+ id="<% $thingstring %>" name="<% $thingstring %>"
+ onchange="<%$p%>Needed();" onkeyup="<%$p%>Later();"
+ value="<% $stringval |h %>"
+ ><% defined($helpref) ? "<a href=\"docs#$helpref\">[?]</a>" : '' %><%
+     $m->content %>
+<br>
+<div id="<%$p%>results">&nbsp;</div><br>
+% } else {
+<kbd><strong><% $canonstring |h %></strong></kbd>
+<br>
+<br>
+% }