<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15692] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15692">15692</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2009-11-27 07:19:00 -0600 (Fri, 27 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>email2pdf:
- more mime drivers: OpenDocument, images, txt
- omit empty generated PDFs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribsathieuemail2pdfREADME">freeswitch/trunk/contrib/sathieu/email2pdf/README</a></li>
<li><a href="#freeswitchtrunkcontribsathieuemail2pdfemail2pdf">freeswitch/trunk/contrib/sathieu/email2pdf/email2pdf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribsathieuemail2pdfREADME"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/sathieu/email2pdf/README (15691 => 15692)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/sathieu/email2pdf/README 2009-11-27 10:29:54 UTC (rev 15691)
+++ freeswitch/trunk/contrib/sathieu/email2pdf/README 2009-11-27 13:19:00 UTC (rev 15692)
</span><span class="lines">@@ -19,9 +19,11 @@
</span><span class="cx">
</span><span class="cx"> email2pdf uses the following tools to convert parts:
</span><span class="cx">
</span><del>- html2ps - for html
- openoffice.org thru ooextract.py - for MS Word, Excel (to be expanded)
</del><ins>+ html2ps - for html and plain
+ openoffice.org thru ooextract.py - for OpenDocument (Text, Spreadsheet, Presentation, Graphics)
+ for MS Word, Excel, PowerPoint
</ins><span class="cx"> See <http://blogs.igalia.com/berto/2007/09/15/converting-office-documents-into-pdf-from-the-command-line/>
</span><ins>+ imagemagick's convert - for gif, jpeg, png and tiff
</ins><span class="cx">
</span><span class="cx"> Share and Enjoy!
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribsathieuemail2pdfemail2pdf"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/sathieu/email2pdf/email2pdf (15691 => 15692)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/sathieu/email2pdf/email2pdf 2009-11-27 10:29:54 UTC (rev 15691)
+++ freeswitch/trunk/contrib/sathieu/email2pdf/email2pdf 2009-11-27 13:19:00 UTC (rev 15692)
</span><span class="lines">@@ -76,18 +76,55 @@
</span><span class="cx"> # CONFIG
</span><span class="cx">
</span><span class="cx"> my $mime_types = {
</span><del>- 'application/vnd.ms-word' => 'msword',
</del><ins>+ #plain and html
+ 'text/plain' => 'plain',
+ 'text/html' => 'html',
</ins><span class="cx">
</span><ins>+ #images
+ 'image/gif' => 'gif',
+ 'image/jpeg' => 'jpeg',
+ 'image/png' => 'png',
+ 'image/tiff' => 'tiff',
+
+ #OpenDocument
+ 'application/vnd.oasis.opendocument.text' => 'opendoctext',
+ 'application/vnd.oasis.opendocument.spreadsheet' => 'opendocspreadsheet',
+ 'application/vnd.oasis.opendocument.presentation' => 'opendocpresentation',
+ 'application/vnd.oasis.opendocument.graphics' => 'opendocgraphics',
+
+ #MS office
</ins><span class="cx"> 'application/vnd.ms-excel' => 'msexcel',
</span><span class="cx"> 'application/msexcel' => 'msexcel',
</span><span class="cx"> 'application/x-msexcel' => 'msexcel',
</span><ins>+ 'application/vnd.ms-powerpoint' => 'mspowerpoint',
+ 'application/vnd.ms-word' => 'msword',
+ 'application/msword' => 'msword',
</ins><span class="cx">
</span><del>- 'text/html' => 'html',
</del><ins>+ 'application/pdf' => 'pdf',
+
</ins><span class="cx"> };
</span><span class="cx"> my $mime_drivers = {
</span><ins>+ #plain and html
+ 'plain' => ['.txt', 'html2ps FILE | ps2pdf - -'],
+ 'html' => ['.html', 'html2ps FILE | ps2pdf - -'],
+
+ #images
+ 'gif' => ['.gif', 'convert FILE -'],
+ 'jpeg' => ['.jpeg', 'convert FILE -'],
+ 'png' => ['.png', 'convert FILE -'],
+ 'tiff' => ['.tiff', 'convert FILE -'],
+
+ #OpenDocument
+ 'opendoctext' => ['.odt', 'python /root/ooextract.py --pdf --stdout FILE'],
+ 'opendocspreadsheet' => ['.ods', 'python /root/ooextract.py --pdf --stdout FILE'],
+ 'opendocpresentation' => ['.odp', 'python /root/ooextract.py --pdf --stdout FILE'],
+ 'opendocgraphics' => ['.odg', 'python /root/ooextract.py --pdf --stdout FILE'],
+
+ #MS office
+ 'msexcel' => ['.xls', 'python /root/ooextract.py --pdf --stdout FILE'],
+ 'mspowerpoint' => ['.ppt', 'python /root/ooextract.py --pdf --stdout FILE'],
</ins><span class="cx"> 'msword' => ['.doc', 'python /root/ooextract.py --pdf --stdout FILE'],
</span><del>- 'msexcel' => ['.xls', 'python /root/ooextract.py --pdf --stdout FILE'],
- 'html' => ['.html', 'html2ps FILE | ps2pdf - -'],
</del><ins>+ 'pdf' => ['.pdf', 'cat FILE'],
</ins><span class="cx"> };
</span><span class="cx"> # Template config
</span><span class="cx"> my $tt_config = {
</span><span class="lines">@@ -120,10 +157,15 @@
</span><span class="cx"> system("chmod +r $filename_in");
</span><span class="cx"> print { $fh_in } $raw;
</span><span class="cx"> $command =~ s/FILE/$filename_in/;
</span><del>- print STDERR "Processing $filename_in\n";
</del><ins>+ print STDERR "Processing $filename_in ($content_type). ";
</ins><span class="cx"> my $out = `$command`;
</span><span class="cx"> close $fh_in or warn $! ? "Error closing sort pipe: $!" : "Exit status $? from sort";
</span><ins>+ if(!$out) {
+ print STDERR "Empty generated PDF.\n";
+ return;
+ }
</ins><span class="cx"> my ($fh_out, $filename_out) = tempfile( DIR => $output_dir, SUFFIX => '.pdf' );
</span><ins>+ print STDERR "To $filename_out. ";
</ins><span class="cx"> print { $fh_out } $out;
</span><span class="cx"> close $fh_out or warn $! ? "Error closing sort pipe: $!" : "Exit status $? from sort";
</span><span class="cx"> if($is_header) {
</span><span class="lines">@@ -132,6 +174,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> push @files, ($filename_out);
</span><span class="cx"> }
</span><ins>+ print STDERR "\n";
</ins><span class="cx"> } else {
</span><span class="cx"> print STDERR "Undefined mime driver: $mime_types->{$content_type}\n";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>