Changed swish-e perl scripts to tolerate -IceTouch suffix and to avoid

generating noisy errors into the web server log about uninitialized variables.

2 files changed, 17 insertions, 5 deletions

diff --git a/cpp/doc/swish/TemplateSlice.pm b/cpp/doc/swish/TemplateSlice.pm
index a346946089d..b0219fe0108 100755
--- a/cpp/doc/swish/TemplateSlice.pm
+++ b/cpp/doc/swish/TemplateSlice.pm
@@ -337,8 +337,12 @@ EOF
 #
 
 sub footer {
+    my $links = '';
     my $results = shift;
-    my $links = qq[<table width="100%"><tr><td colspan="2" bgcolor="#EEEEEE">$results->{LINKS}</td></tr></table>] if $results->{LINKS};
+    if ($results)
+    {
+        my $links = qq[<table width="100%"><tr><td colspan="2" bgcolor="#EEEEEE">$results->{LINKS}</td></tr></table>] if $results->{LINKS};
+    }
     return <<EOF;
             $links
         </div>
diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf
index 8fc445f4382..03708c2cb86 100644
--- a/cpp/doc/swish/swishcgi.conf
+++ b/cpp/doc/swish/swishcgi.conf
@@ -1,9 +1,16 @@
 use lib '/var/www/html/doc/swishdir';
 
-my $referer = $ENV{HTTP_REFERER};
-$referer =~ m{/Ice-([0-9]+\.[0-9]+\.[0-9]+b?)/};;
-my $ice_version = $1;
-$index_loc = '../html/doc/Ice-' . $ice_version . '/swishdir/index.swish-e';
+my $ice_version = '3.3.0';
+my $suffix = '-IceTouch';
+
+my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : '';
+if ($referer =~ m{/Ice-([0-9]+\.[0-9]+\.[0-9]+)(b|-IceTouch)?/})
+{
+    my $ice_version = $1;
+    my $suffix = $2;
+}
+
+$index_loc = '../html/doc/Ice-' . $ice_version . $suffix . '/swishdir/index.swish-e';
 
 return {
     swish_index	=> $index_loc,
@@ -15,4 +22,5 @@ return {
     },
     display_props => '',
     prepend_path => '../',
+    page_size => 200,
 };