setup and pdfextract optimisations

diff --git a/Tools/pdfextract.pl b/Tools/pdfextract.pl
index 3130134..c04fbf7 100644 (file)
--- a/Tools/pdfextract.pl
+++ b/Tools/pdfextract.pl
@@ -200,6 +200,10 @@ sub parseinvoicedata(){
         }
         if ($p =~ /Heures.+\sh\s/) {
           my ($hrs,$p1,$e1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
+          if (!defined($hrs)){
+               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2}).+$/;
+               $e1 = "0,0";
+          }
           $p1 =~ s/,/\./;
           $e1 =~ s/,/\./;
           $p1 =~ s/\ //;
@@ -213,6 +217,10 @@ sub parseinvoicedata(){
         }
         if ($p =~ /Horas.+\sh\s/) {
           my ($hrs,$p1,$e1) = $p =~ m/.+Horas.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
+          if (!defined($hrs)){
+               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2}).+$/;
+               $e1 = "0,0";
+          }
           $p1 =~ s/,/\./;
           $e1 =~ s/,/\./;
           $p1 =~ s/\ //;
@@ -226,6 +234,10 @@ sub parseinvoicedata(){
         }
         if ($p =~ /Stunden.+\sSt.\s/) {
           my ($hrs,$p1,$e1) = $p =~ m/.+Stunden.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
+          if (!defined($hrs)){
+               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2}).+$/;
+               $e1 = "0,0";
+          }
           $p1 =~ s/,/\./;
           $e1 =~ s/,/\./;
           $p1 =~ s/\ //;
@@ -239,6 +251,10 @@ sub parseinvoicedata(){
         }
         if ($p =~ /Stonnen.+\sSt.\s/) {
           my ($hrs,$p1,$e1) = $p =~ m/.+Stonnen.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
+          if (!defined($hrs)){
+               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2}).+$/;
+               $e1 = "0,0";
+          }
           $p1 =~ s/,/\./;
           $e1 =~ s/,/\./;
           $p1 =~ s/\ //;
@@ -310,8 +326,14 @@ sub parseinvoicedata(){
                $e1 =~ s/\ //;
                $pxdata->{benefitamount} = $e1;
         }
-        if (($p =~ /Montant\s.\sr.gler/) || ($p =~ /Montante a pagar/)) {
-          my ($m1) = $p =~ m/.+Montant.+\s+([\s|\d]+,\d{1,2}).+$/;
+        if (($p =~ /Montant\s.\sr.gler/)) {
+          my ($m1) = $p =~ m/.+Montant\s.\sr.gler\s+([\s|\d]+,\d{1,2}).+$/;
+          $m1 =~ s/,/\./;
+          $m1 =~ s/\ //;
+          $pxdata->{totalamount} = $m1;
+        }
+        if (($p =~ /Montante a pagar/)) {
+          my ($m1) = $p =~ m/.+Montante\sa\spagarr\s+([\s|\d]+,\d{1,2}).+$/;
           $m1 =~ s/,/\./;
           $m1 =~ s/\ //;
           $pxdata->{totalamount} = $m1;

diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index 6588f17..dc8cfe9 100644 (file)
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -184,11 +184,12 @@ if (($setup eq "director")){
   make_path("C:\\Users\\ksaff\\Release\\dist\\Tools");
   copy("C:\\Debug\\Creorga\\Tools\\pdftotext.exe","C:\\Users\\ksaff\\Release\\dist\\Tools\\pdftotext.exe");
   #chdir("C:\\Users\\ksaff\\Release\\tag\\tools\\perl");
-  chdir("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnclose.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
+#  chdir("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools");
+#  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnclose.sh");
+#  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
+#  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
   #compile executeables
+  chdir("C:\\Users\\ksaff\\Release\\tag\\Tools");
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" creorgadb.pl');
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\pdfextract.exe" pdfextract.pl');
 }