don't die if ISIS database is not found, just go to next one

[webpac] / back2html.pm

diff --git a/back2html.pm b/back2html.pm
index 95742d2..ba224c7 100644 (file)
--- a/back2html.pm
+++ b/back2html.pm
@@ -6,6 +6,7 @@
 
 sub back2html {
        my $html = shift;
+       my $url_params = shift;
 
        $html =~ s/</&lt;/g;
        $html =~ s/>/&gt;/g;
@@ -16,7 +17,7 @@ sub back2html {
                # convert spaces in left field to non-breaking spaces
                $items[0] =~ s#\s+#&nbsp;#g;
                # try to make link on right field
-               sub mkurl {
+               sub mkurl($) {
                        my $url = shift || die "mkurl needs url as argument";
                        # chop URLS longer than 60 characters
                        my $txturl = substr($1,0,60);
@@ -27,7 +28,21 @@ sub back2html {
                $out .= join("</td><td>",@items);
                $out .= "</td></tr>\n";
        }
-       $out =~ s/&lt;br\/*&gt;/<br\/>/g;
+       # put <br> back into html
+       $out =~ s,&lt;br/*&gt;,<br/>,gi;
+       # put <a href=xxx>yyyy</a> back into html
+       sub mkurl_param($$$$) {
+               my ($a_href,$url,$text,$a_end) = @_;
+               if ($url_params) {
+                       if ($url =~ m#\?#) {
+                               $url .= "&".$url_params;
+                       } else {
+                               $url .= "?".$url_params;
+                       }
+               }
+               return '<'.$a_href.'"'.$url.'">'.$text.'<'.$a_end.'>';
+       }
+       $out =~ s#&lt;(a\s+href=)['"]*(.+?)['"]*&gt;(.+?)&lt;(/a)&gt;#mkurl_param($1,$2,$3,$4)#gsie;
        return $out;
 }