|;
+
+ my @parts = map {
+ if (substr($_, 0, 1) eq '<') {
+ s{ +}{}g;
+ if ($_ eq '') {
+ $in_p--;
+ $in_p == 0 ? '' : '';
+
+ } elsif ($_ eq '') {
+ $in_p++;
+ $in_p == 1 ? $p_start_tag : '';
+
+ } elsif ($_ eq '
') {
+ $self->{used_list_styles}->{itemize}->{$self->{current_text_style}} = 1;
+ $html_replace{'- '} = $ul_li_start_tag;
+ $ul_start_tag;
+
+ } elsif ($_ eq '
') {
+ $self->{used_list_styles}->{enumerate}->{$self->{current_text_style}} = 1;
+ $html_replace{'- '} = $ol_li_start_tag;
+ $ol_start_tag;
+
+ } else {
+ $html_replace{$_} || '';
+ }
+
+ } else {
+ $::locale->quote_special_chars('Template/OpenDocument', HTML::Entities::decode_entities($_));
+ }
+ } split(m{(<.*?>)}x, $content);
+
+ my $out = join('', $prefix, @parts, $suffix);
+
+ # $::lxdebug->dump(0, "prefix parts suffix", [ $prefix, join('', @parts), $suffix ]);
+
+ return $out;
+}
+
+my %formatters = (
+ html => \&_format_html,
+ text => \&_format_text,
+);
+
sub new {
my $type = shift;
my $self = $type->SUPER::new(@_);
- $self->{"rnd"} = int(rand(1000000));
- $self->{"iconv"} = SL::Iconv->new($main::dbcharset, "UTF-8");
-
$self->set_tag_style('<%', '%>');
$self->{quot_re} = '"';
@@ -37,7 +164,7 @@ sub parse_foreach {
my $ary = $self->_get_loop_variable($var, 1, @indices);
- for (my $i = 0; $i < scalar(@{$ary}); $i++) {
+ for (my $i = 0; $i < scalar(@{$ary || []}); $i++) {
$form->{"__first__"} = $i == 0;
$form->{"__last__"} = ($i + 1) == scalar(@{$ary});
$form->{"__odd__"} = (($i + 1) % 2) == 1;
@@ -102,9 +229,13 @@ sub parse_block {
while ($contents ne "") {
if (substr($contents, 0, 1) eq "<") {
- $contents =~ m|^<[^>]+>|;
- my $tag = $&;
- substr($contents, 0, length($&)) = "";
+ $contents =~ m|^(<[^>]+>)|;
+ my $tag = $1;
+ substr($contents, 0, length($1)) = "";
+
+ $self->{current_text_style} = $1 if $tag =~ m|text:style-name\s*=\s*"([^"]+)"|;
+
+ push @{ $self->{tag_stack} }, $tag;
if ($tag =~ m|]*>)|;
@@ -114,10 +245,10 @@ sub parse_block {
if ($table_row =~ m|\<\%foreachrow\s+(.*?)\%\>|) {
my $var = $1;
- $contents =~ m|\<\%foreachrow\s+.*?\%\>|;
- substr($contents, length($`), length($&)) = "";
+ $contents =~ m|^(.*?)(\<\%foreachrow\s+.*?\%\>)|;
+ substr($contents, length($1), length($2)) = "";
- ($table_row, $contents) = $self->find_end($contents, length($`));
+ ($table_row, $contents) = $self->find_end($contents, length($1));
if (!$table_row) {
$self->{"error"} = "Unclosed <\%foreachrow\%>." unless ($self->{"error"});
$main::lxdebug->leave_sub();
@@ -128,7 +259,7 @@ sub parse_block {
$table_row .= $1;
$end_tag = $2;
- substr $contents, 0, length($&), '';
+ substr $contents, 0, length($1) + length($2), '';
my $new_text = $self->parse_foreach($var, $table_row, $tag, $end_tag, @indices);
if (!defined($new_text)) {
@@ -151,9 +282,14 @@ sub parse_block {
$new_contents .= $tag;
}
+ if ($tag =~ m{^$}x) {
+ # $::lxdebug->message(0, "popping top tag is $tag top " . $self->{tag_stack}->[-1]);
+ pop @{ $self->{tag_stack} };
+ }
+
} else {
- $contents =~ /^[^<]+/;
- my $text = $&;
+ $contents =~ /^([^<]+)/;
+ my $text = $1;
my $pos_if = index($text, '<%if');
my $pos_foreach = index($text, '<%foreach');
@@ -168,15 +304,15 @@ sub parse_block {
$new_contents .= $self->substitute_vars(substr($contents, 0, $pos_foreach), @indices);
substr($contents, 0, $pos_foreach) = "";
- if ($contents !~ m|^\<\%foreach (.*?)\%\>|) {
+ if ($contents !~ m|^(\<\%foreach (.*?)\%\>)|) {
$self->{"error"} = "Malformed <\%foreach\%>.";
$main::lxdebug->leave_sub();
return undef;
}
- my $var = $1;
+ my $var = $2;
- substr($contents, 0, length($&)) = "";
+ substr($contents, 0, length($1)) = "";
my $block;
($block, $contents) = $self->find_end($contents);
@@ -236,48 +372,52 @@ sub parse {
return 0;
}
- my $rnd = $self->{"rnd"};
- my $new_styles = qq|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-|;
-
- $contents =~ s||${new_styles}|;
- $contents =~ s|[\n\r]||gm;
-
- my $new_contents = $self->parse_block($contents);
+ $self->{current_text_style} = '';
+ $self->{used_list_styles} = {
+ itemize => {},
+ enumerate => {},
+ };
+
+ my $new_contents;
+ if ($self->{use_template_toolkit}) {
+ my $additional_params = $::form;
+
+ $::form->template->process(\$contents, $additional_params, \$new_contents) || die $::form->template->error;
+ } else {
+ $self->{tag_stack} = [];
+ $new_contents = $self->parse_block($contents);
+ }
if (!defined($new_contents)) {
$main::lxdebug->leave_sub();
return 0;
}
+ my $new_styles = SL::Template::OpenDocument::Styles->get_style('text_basic');
+
+ foreach my $type (qw(itemize enumerate)) {
+ foreach my $parent (sort { $a cmp $b } keys %{ $self->{used_list_styles}->{$type} }) {
+ $new_styles .= SL::Template::OpenDocument::Styles->get_style('text_list_item', TYPE => $type, PARENT => $parent)
+ . SL::Template::OpenDocument::Styles->get_style("list_${type}", TYPE => $type, PARENT => $parent);
+ }
+ }
+
+ # $::lxdebug->dump(0, "new_Styles", $new_styles);
+
+ $new_contents =~ s||${new_styles}|;
+ $new_contents =~ s|[\n\r]||gm;
+
# $new_contents =~ s|>|>\n|g;
$zip->contents("content.xml", Encode::encode('utf-8-strict', $new_contents));
- my $styles = $zip->contents("styles.xml");
+ my $styles = Encode::decode('utf-8-strict', $zip->contents("styles.xml"));
if ($contents) {
my $new_styles = $self->parse_block($styles);
if (!defined($new_contents)) {
$main::lxdebug->leave_sub();
return 0;
}
- $zip->contents("styles.xml", $new_styles);
+ $zip->contents("styles.xml", Encode::encode('utf-8-strict', $new_styles));
}
$zip->writeToFileNamed($form->{"tmpfile"}, 1);
@@ -370,7 +510,9 @@ sub spawn_xvfb {
$main::lxdebug->message(LXDebug->DEBUG2(), " xauthority $xauthority\n");
- system("xauth add \"${display}\" . \"${mcookie}\"");
+ if (system("xauth add \"${display}\" . \"${mcookie}\"") == -1) {
+ die "system call to xauth failed: $!";
+ }
if ($? != 0) {
$self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started (xauth: $!)";
$main::lxdebug->leave_sub();
@@ -382,14 +524,14 @@ sub spawn_xvfb {
my $pid = fork();
if (0 == $pid) {
$main::lxdebug->message(LXDebug->DEBUG2(), " Child execing\n");
- exec($main::xvfb_bin, $display, "-screen", "0", "640x480x8", "-nolisten", "tcp");
+ exec($::lx_office_conf{applications}->{xvfb}, $display, "-screen", "0", "640x480x8", "-nolisten", "tcp");
}
sleep(3);
$main::lxdebug->message(LXDebug->DEBUG2(), " parent dont sleeping\n");
local *OUT;
my $dfname = $self->{"userspath"} . "/xvfb_display";
- if (!open(OUT, ">$dfname")) {
+ if (!open(OUT, ">", $dfname)) {
$self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started ($dfname: $!)";
unlink($xauthority);
kill($pid);
@@ -416,10 +558,21 @@ sub spawn_xvfb {
return $display;
}
+sub _run_python_uno {
+ my ($self, @args) = @_;
+
+ local $ENV{PYTHONPATH};
+ $ENV{PYTHONPATH} = $::lx_office_conf{environment}->{python_uno_path} . ':' . $ENV{PYTHONPATH} if $::lx_office_conf{environment}->{python_uno_path};
+ my $cmd = $::lx_office_conf{applications}->{python_uno} . ' ' . join(' ', @args);
+ return `$cmd`;
+}
+
sub is_openoffice_running {
+ my ($self) = @_;
+
$main::lxdebug->enter_sub();
- my $output = `./scripts/oo-uno-test-conn.py $main::openofficeorg_daemon_port 2> /dev/null`;
+ my $output = $self->_run_python_uno('./scripts/oo-uno-test-conn.py', $::lx_office_conf{print_templates}->{openofficeorg_daemon_port}, ' 2> /dev/null');
chomp $output;
my $res = ($? == 0) || $output;
@@ -446,10 +599,19 @@ sub spawn_openoffice {
last;
}
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Detach;
+ }
+
if (!$spawned_oo) {
my $pid = fork();
if (0 == $pid) {
$main::lxdebug->message(LXDebug->DEBUG2(), " Child daemonizing\n");
+
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Finish;
+ $::dispatcher->{request}->LastCall;
+ }
chdir('/');
open(STDIN, '/dev/null');
open(STDOUT, '>/dev/null');
@@ -457,12 +619,17 @@ sub spawn_openoffice {
exit if ($new_pid);
my $ssres = setsid();
$main::lxdebug->message(LXDebug->DEBUG2(), " Child execing\n");
- my @cmdline = ($main::openofficeorg_writer_bin,
+ my @cmdline = ($::lx_office_conf{applications}->{openofficeorg_writer},
"-minimized", "-norestore", "-nologo", "-nolockcheck",
"-headless",
"-accept=socket,host=localhost,port=" .
- $main::openofficeorg_daemon_port . ";urp;");
+ $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;");
exec(@cmdline);
+ } else {
+ # parent
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Attach;
+ }
}
$main::lxdebug->message(LXDebug->DEBUG2(), " Parent after fork\n");
@@ -507,27 +674,22 @@ sub convert_to_pdf {
return 0;
}
- my @cmdline;
- if (!$main::openofficeorg_daemon) {
- @cmdline = ($main::openofficeorg_writer_bin,
- "-minimized", "-norestore", "-nologo", "-nolockcheck",
- "-headless",
- "file:${filename}.odt",
- "macro://" . (split('/', $filename))[-1] .
- "/Standard.Conversion.ConvertSelfToPDF()");
+ if (!$::lx_office_conf{print_templates}->{openofficeorg_daemon}) {
+ if (system($::lx_office_conf{applications}->{openofficeorg_writer},
+ "-minimized", "-norestore", "-nologo", "-nolockcheck", "-headless",
+ "file:${filename}.odt",
+ "macro://" . (split('/', $filename))[-1] . "/Standard.Conversion.ConvertSelfToPDF()") == -1) {
+ die "system call to $::lx_office_conf{applications}->{openofficeorg_writer} failed: $!";
+ }
} else {
if (!$self->spawn_openoffice()) {
$main::lxdebug->leave_sub();
return 0;
}
- @cmdline = ("./scripts/oo-uno-convert-pdf.py",
- $main::openofficeorg_daemon_port,
- "${filename}.odt");
+ $self->_run_python_uno('./scripts/oo-uno-convert-pdf.py', $::lx_office_conf{print_templates}->{openofficeorg_daemon_port}, "${filename}.odt");
}
- system(@cmdline);
-
my $res = $?;
if ((0 == $?) || (-f "${filename}.pdf" && -s "${filename}.pdf")) {
$form->{"tmpfile"} =~ s/odt$/pdf/;
@@ -548,25 +710,14 @@ sub convert_to_pdf {
}
sub format_string {
- my ($self, $variable) = @_;
- my $form = $self->{"form"};
- my $iconv = $self->{"iconv"};
-
- $variable = $main::locale->quote_special_chars('Template/OpenDocument', $variable);
+ my ($self, $content, $variable) = @_;
- # Allow some HTML markup to be converted into the output format's
- # corresponding markup code, e.g. bold or italic.
- my $rnd = $self->{"rnd"};
- my %markup_replace = ("b" => "BOLD", "i" => "ITALIC", "s" => "STRIKETHROUGH",
- "u" => "UNDERLINE", "sup" => "SUPER", "sub" => "SUB");
-
- foreach my $key (keys(%markup_replace)) {
- my $value = $markup_replace{$key};
- $variable =~ s|\<${key}\>||gi; #"
- $variable =~ s|\</${key}\>||gi;
- }
+ my $formatter =
+ $formatters{ $self->{variable_content_types}->{$variable} }
+ // $formatters{ $self->{default_content_type} }
+ // $formatters{ text };
- return $iconv->convert($variable);
+ return $formatter->($self, $content, variable => $variable);
}
sub get_mime_type() {