X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=back2html.pm;h=0fcf9318c7bb83479fe5fdd8e9eb638027ce1b48;hb=5bd22bec41221e9d5f8b10c570f542898ff6d106;hp=64bb9e0f0a3f9590c17ac9727fcaea6e0e4c96b9;hpb=919a86804a101ca3d014ef722dd87812968d454e;p=webpac
diff --git a/back2html.pm b/back2html.pm
index 64bb9e0..0fcf931 100644
--- a/back2html.pm
+++ b/back2html.pm
@@ -6,15 +6,41 @@
sub back2html {
my $html = shift;
+ my $url_params = shift;
+ $html =~ s/</g;
+ $html =~ s/>/>/g;
my $out;
- foreach $line (split(/###/,$html)) {
- $out .= "
";
- my @items = split(/#-#/,$line);
+ foreach $line (split(/\s*###\s*/,$html)) {
+ $out .= " |
";
+ my @items = split(/\s*#-#\s*/,$line);
+ # convert spaces in left field to non-breaking spaces
+ $items[0] =~ s#\s+# #g;
+ # try to make link on right field
+ sub mkurl($) {
+ my $url = shift || die "mkurl needs url as argument";
+ # chop URLS longer than 60 characters
+ my $txturl = substr($1,0,60);
+ $txturl .= "..." if (length($1) > 60);
+ return "$txturl";
+ }
+ $items[1] =~ s#(http://[\S]+)#mkurl($1)#gie;
$out .= join(" | ",@items);
$out .= " |
\n";
}
- $out =~ s/<br/*>/
/g;
+ # put
back into html
+ $out =~ s,<br/*>,
,gi;
+ # put yyyy back into html
+ sub mkurl_param($$$$) {
+ my ($a_href,$url,$text,$a_end) = @_;
+ if ($url =~ m#\?#) {
+ $url .= "&".$url_params;
+ } else {
+ $url .= "?".$url_params;
+ }
+ return '<'.$a_href.'"'.$url.'">'.$text.'<'.$a_end.'>';
+ }
+ $out =~ s#<(a\s+href=)['"]*(.+?)['"]*>(.+?)<(/a)>#mkurl_param($1,$2,$3,$4)#gsie;
return $out;
}