Changeset 5949

Timestamp:

01/06/10 02:33:08 (2 years ago)

Author:

GeorgeClark

Message:

Item2592: Normalize topic names for Title and Header/Footer topics. Handle empty / missing image files.

File:

• trunk/GenPDFAddOn/lib/Foswiki/Contrib/GenPDF.pm (modified) (5 diffs)

trunk/GenPDFAddOn/lib/Foswiki/Contrib/GenPDF.pm

@@ -247 +247 @@
     # Get a topic name without any whitespace
     $topic =~ s|\s||g;
+
+    ($webName, $topic) = Foswiki::Func::normalizeWebTopicName($webName, $topic);
+
     if ( $prefs{'hftopic'} ) {
         $text = Foswiki::Func::readTopicText( $webName, $topic );
@@ -305 +308 @@
     my $topic = $prefs{'titletopic'};
 
+    ($webName, $topic) = Foswiki::Func::normalizeWebTopicName($webName, $topic);
+
+
+    _writeDebug("building title topic  $topic" ) if $prefs{'debug'};    # DEBUG
+
+
     # Get a topic name without any whitespace
     $topic =~ s|\s||g;
@@ -312 +321 @@
         my $doc = $prefs{'titledoc'};
         if ($doc) {
+            _writeDebug("building title topic from an attachment  $webName, $topic, $doc" ) if $prefs{'debug'};    # DEBUG
             $text = Foswiki::Func::readAttachment( $webName, $topic, $doc );
             if ($text) {
@@ -329 +339 @@
         }
         else {
+            _writeDebug("building title topic from a topic  $webName, $topic" ) if $prefs{'debug'};    # DEBUG
             $text .= Foswiki::Func::readTopicText( $webName, $topic );
+            if ( $text =~ /^http.*\/.*\/oops\/.*oopsaccessview$/ ) {
+                _writeDebug("Access exception reading   $webName, $topic" );    # DEBUG
+                }
+                         
         }
     }
@@ -503 +518 @@
               Foswiki::Func::readAttachment( $imgInfo->{web}, $imgInfo->{topic},
                 $imgInfo->{file} );
-            binmode $tempfh;
-            print $tempfh $data;    # copy the attachment to the temporary file
-            close $tempfh;
+            if ($data) {
+                binmode $tempfh;
+                print $tempfh $data;    # copy the attachment to the temporary file
+                close $tempfh;
+            }
         }
         catch Foswiki::AccessControlException with {