X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fqtextstringcheck;h=9dce8287e208d8213418dd6432e49898c998a74a;hp=4adb606ea0b2c3e25dc8251dac335a47ee24e7e6;hb=aaac8ff612afe5c10dd97a61f44870c24da4fcad;hpb=422fab9f34f08090bca02f67cb41bba31f816c7e

diff --git a/yarrg/web/qtextstringcheck b/yarrg/web/qtextstringcheck
index 4adb606..9dce828 100755
--- a/yarrg/web/qtextstringcheck
+++ b/yarrg/web/qtextstringcheck
@@ -95,7 +95,7 @@ if ($chk->method_exists('execute')) {
 	my $sqlstmt_nqs= @sqlstmt_nqs;
 
 	my @specs= $chk->attr('multiple')
-		? (split m#[/|,]#, $string)
+		? (split m#\s*[/|,]\s*#, $string)
 		: ($string);
 
 	foreach my $each (@specs) {
@@ -109,7 +109,7 @@ if ($chk->method_exists('execute')) {
 			$chk->scall_method("manyambig"),
 			sub {
 				$chk->scall_method("ambiguous",
-					spec => $each, couldbe => $_[0])
+					spec => $each, couldbe => $_[1])
 			});
 		if (defined $temsg) {
 			$emsg= $temsg;
@@ -129,7 +129,10 @@ $emsg='' if !defined $emsg;
 $debugf->("QTSC EMSG='$emsg' RESULTS='@results'");
 
 if ($format =~ /json/) {
-	$r->content_type($ctype or $format);
+	$ctype ||= $format;
+	die unless grep { $_ eq $ctype }
+		qw(application/json text/plain text/xml);
+	$r->content_type($ctype);
 	my $jobj= {
 		success => 1*!length $emsg,
 		show => (length $emsg      ? $emsg                       :