SF.net SVN: net-policy: [4703] trunk/net-policy/perl/QWizard/Generator/HTML .pm

[<har...@us...>]

Revision: 4703
          http://net-policy.svn.sourceforge.net/net-policy/?rev=4703&view=rev
Author:   hardaker
Date:     2008-03-16 12:00:49 -0700 (Sun, 16 Mar 2008)

Log Message:
-----------
pass ouputfile into datafn generator

Modified Paths:
--------------
    trunk/net-policy/perl/QWizard/Generator/HTML.pm

Modified: trunk/net-policy/perl/QWizard/Generator/HTML.pm
===================================================================
--- trunk/net-policy/perl/QWizard/Generator/HTML.pm	2008-03-16 14:31:33 UTC (rev 4702)
+++ trunk/net-policy/perl/QWizard/Generator/HTML.pm	2008-03-16 19:00:49 UTC (rev 4703)
@@ -1071,6 +1071,7 @@
     # XXX: this is not efficient and techinically should be generated on demand.
 
     my ($fh, $outputfile) = $self->create_temp_fh($extension || '.bin');
+    $outputfile =~ s/.*\///;
 
     # print the passed in data
     print $fh $data if ($data);
@@ -1078,14 +1079,13 @@
     # if we have code to use for directly printing data, call it
     if ($datafn && ref($datafn) eq 'CODE') {
 	# passed a generator function; call it
-	$datafn->($fh, undef, $wiz, $p, $q);
+	$datafn->($fh, undef, $wiz, $p, $q, $outputfile);
     }
 
     # close it out
     $fh->close();
 
     # print the resulting html out
-    $outputfile =~ s/.*\///;
     print "<a href=\"" . $self->{'datapath'} . escapeHTML($outputfile) ."\">"
       . escapeHTML($linktext) . "</a>";
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.