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=16aa372bd6794caad89992d6d7b2f2a976d519c2;hb=ea3cffe854b1c540bc68cd2218fdb2be732197fa;hpb=608bc9e07b5c8a961325fd1b8d5b92f65418b949

diff --git a/yarrg/web/qtextstring b/yarrg/web/qtextstring
index 16aa372..6872e7e 100644
--- a/yarrg/web/qtextstring
+++ b/yarrg/web/qtextstring
@@ -39,77 +39,97 @@
 $qa => $m->caller_args(1)->{'qa'}
 $dbh
 $thingstring
+$checkkind => undef
 $emsgstore
-$perresult
+$onresults
+$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_${checkkind}");
+my $significant_nonempty= $checker->attr_exists('significant_nonempty');
+
 </%perl>
 
 <&| script &>
-ts_uri= "qtextstringcheck?format=application/json&ctype=text/xml"
-		+ "&what=<% $thingstring %>"
+<%$p%>uri= "qtextstringcheck?format=application/json&ctype=text/xml"
+		+ "&what=<% $checkkind %>"
 		+ "&ocean=<% uri_escape($qa->{Ocean}) %>";
 
-ts_timeout=false;
-ts_request=false;
-ts_done='';
-ts_needed='';
-function ts_Later(){
-  window.clearTimeout(ts_timeout);
-  ts_timeout = window.setTimeout(ts_Needed, 500);
+<%$p%>timeout=false;
+<%$p%>request=false;
+<%$p%>done=<% $significant_nonempty ? "null" : "''" %>;
+<%$p%>needed='';
+function <%$p%>Later(){
+  window.clearTimeout(<%$p%>timeout);
+  <%$p%>timeout = window.setTimeout(<%$p%>Needed, 500);
 }
-function ts_Needed(){
-  window.clearTimeout(ts_timeout);
-  ts_element= document.getElementById('<% $thingstring %>');
-  ts_needed= ts_element.value;
-  ts_Request();
+function <%$p%>Needed(){
+  window.clearTimeout(<%$p%>timeout);
+  <%$p%>element= document.getElementById('<% $thingstring %>');
+  <%$p%>needed= <%$p%>element.value;
+  <%$p%>Request();
 }
-function ts_Request(){
-  if (ts_request || ts_needed==ts_done) return;
-  ts_done= ts_needed;
-  ts_request= new XMLHttpRequest();
-  uri= ts_uri+'&string='+encodeURIComponent(ts_needed);
-  ts_request.open('GET', uri);
-  ts_request.onreadystatechange= ts_Ready;
-  ts_request.send(null);
+function <%$p%>Request(){
+  if (<%$p%>request || <%$p%>needed==<%$p%>done) return;
+  <%$p%>done= <%$p%>needed;
+  <%$p%>request= new XMLHttpRequest();
+  uri= <%$p%>uri+'&string='+encodeURIComponent(<%$p%>needed);
+  <%$p%>request.open('GET', uri);
+  <%$p%>request.onreadystatechange= <%$p%>Ready;
+  <%$p%>request.send(null);
 }
-function ts_Ready() {
-  if (ts_request.readyState != 4) return;
-  if (ts_request.status == 200) {
-    response= ts_request.responseText;
-    debug('got '+response);
+function <%$p%>Ready() {
+  if (<%$p%>request.readyState != 4) return;
+  if (<%$p%>request.status == 200) {
+    response= <%$p%>request.responseText;
+    debug('<%$p%> got '+response);
     eval('results='+response);
-    toedit= document.getElementById('ts_results');
+    toedit= document.getElementById('<%$p%>results');
     toedit.innerHTML= results.show;
   }
-  ts_request= false;
-  ts_Request();
+  <%$p%>request= false;
+  <%$p%>Request();
 }
-window.onload= ts_Needed;
+register_onload(<%$p%>Needed);
 </&script>
 
-<input type="text" <% $m->content %>
- id="<% $thingstring %>" name="<% $thingstring %>"
- onchange="ts_Needed();" onkeyup="ts_Later();"
- value="<% $stringval |h %>"
- >
-<br>
-<div id="ts_results">&nbsp;</div><br>
-
 <%perl>
-if (length $thingstring) {
-	my ($emsg,$canonstring,$results)= $m->comp('qtextstringcheck',
-		what => $thingstring,
+my ($canonstring);
+
+if ($significant_nonempty || length $thingstring) {
+	my ($emsg,@results);
+	($emsg,$canonstring,@results)= $m->comp('qtextstringcheck',
+		what => $checkkind,
 		ocean => $qa->{Ocean},
 		string => $stringval,
 		format => 'return'
 	);
-	$$emsgstore= $emsg;
-
-	foreach my $entry (@$results) {
-		$perresult->(@$entry);
+	if (defined $emsg and length $emsg) {
+		$$emsgstore='' unless defined $$emsgstore;
+		$$emsgstore .= $emsg. ' ';
 	}
+	$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>
+% }