Mehrere neue Outputtypen für die parsing engine eingebaut:

[mfinanz.git] / bin / mozilla / common.pl

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index fb98b70c0fce135943cfd575adf463f5b5b27383..67b9e076fa9e6194eab58383e3e156e6f01ee88f 100644 (file)
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -16,9 +16,14 @@ use SL::Common;
 sub save_form {
   $lxdebug->enter_sub();
 
-  my $old_form = "";
-  map({ $old_form .= "$_=" . $form->escape($form->{$_}) . '&'; } keys(%{$form}));
-  chop($old_form);
+  my (@names, @values);
+  foreach my $key (keys(%{$form})) {
+    push(@names, "\$form->{\"$key\"}");
+    push(@values, $form->{$key});
+  }
+  my $dumper = Data::Dumper->new(\@values, \@names);
+  $dumper->Indent(0);
+  my $old_form = $dumper->Dump();
 
   $lxdebug->leave_sub();
 
@@ -28,14 +33,10 @@ sub save_form {
 sub restore_form {
   $lxdebug->enter_sub();
 
-  my ($old_form) = @_;
-
-  map({ delete($form->{$_}); } keys(%{$form}));
+  my ($old_form, $no_delete) = @_;
 
-  foreach my $pair (split('&', $old_form)) {
-    my ($key, $value) = split('=', $form->unescape($pair), 2);
-    $form->{$key} = $value;
-  }
+  map({ delete($form->{$_}); } keys(%{$form})) unless ($no_delete);
+  eval($old_form);
 
   $lxdebug->leave_sub();
 }
@@ -400,55 +401,6 @@ sub calculate_qty {
   $lxdebug->leave_sub();
 }
 
-sub calculate_alu {
-  $lxdebug->enter_sub();
-
-  my ($length, $weight) = split /\r\n/,$form->{formel};
-
-  map({ $form->{$_} = "" } (qw(qty_alu price_alu total_alu qty_eloxal price_eloxal total_eloxal total)));
-
-  if ($form->{description} =~ /.*Alupreisberechnung.*/) {
-    $form->{description} =~ /.*Alupreisberechnung:\n(.*)kg Aluminiumprofil Einzelpreis: (.*) Gesamt: (.*)\n(.*)m Eloxal Einzelpreis: (.*) Gesamt: (.*)/;
-    $form->{qty_alu} = $1;
-    $form->{price_alu} = $2;
-    $form->{total_alu} = $3;
-    $form->{qty_eloxal} = $4;
-    $form->{price_eloxal} = $5;
-    $form->{total_eloxal} = $6;
-    $form->{total} = $form->format_amount(\%myconfig, ($form->parse_amount(\%myconfig, $form->{total_alu}) + $form->parse_amount(\%myconfig, $form->{total_eloxal})));
-  }
-  ($form->{description}, $null) = split /\nAlupreisberechnung/, $form->{description};
-
-  my $callback = "$form->{script}?action=vendor_selection&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
-
-  my @header_sort = qw(name customernumber address);
-  my %header_title = ( "name" => $locale->text("Name"),
-                       "customernumber" => $locale->text("Customer Number"),
-                       "address" => $locale->text("Address"),
-                     );
-  ($null, $form->{weight}) = split / /, $weight;
-  ($null, $form->{length}) = split / /, $length;
-
-  $form->{calc_weight} = $form->parse_amount(\%myconfig, $form->{weight});
-  $form->{calc_length} = $form->parse_amount(\%myconfig, $form->{length});
-
-
-  my @header =
-    map(+{ "column_title" => $header_title{$_},
-           "column" => $_,
-         },
-        @header_sort);
-
-  $form->{"title"} = $locale->text("Enter values for aluminium calculation");
-  $form->header();
-  print($form->parse_html_template("generic/calculate_alu"));
-
-  $lxdebug->leave_sub();
-}
-
-
 sub set_longdescription {
   $lxdebug->enter_sub();
 
@@ -464,4 +416,8 @@ sub set_longdescription {
   $lxdebug->leave_sub();
 }
 
+sub H {
+  return $form->quote_html($_[0]);
+}
+
 1;