v20200131

diff --git a/bin/ranglescht.pl b/bin/ranglescht.pl
index f8527c3..bfcc1ca 100644 (file)
--- a/bin/ranglescht.pl
+++ b/bin/ranglescht.pl
@@ -4,9 +4,13 @@ use Spreadsheet::XLSX;
 use Encode;
 use Getopt::Long;
 use Data::Dumper;
+use lib 
 my $xlsxfile = "";
 GetOptions("xlsx|x=s" => \$xlsxfile);
-
+my $p->{file} = $xlsxfile;
+$p->{listname} = "haeren"; #dammen
+$p->{rl} = "4";
+$p->{season} = "2019-2020";
 my $excel = Spreadsheet::XLSX -> new ($xlsxfile);
 my $points = (); 
 my $cols = ();
@@ -46,45 +50,45 @@ foreach my $sheet (@{$excel -> {Worksheet}}) {
     }
     
   }
-# my $xlsx = parsexlsx->new();
-#     my @data = $xlsx->sheetdata($p->{file},"Tabelle1");
-#     my $dataok = 0;
-#     my @datax = ();
-#     my $colnames = ();
-#     foreach my $c (@data){
+my $xlsx = parsexlsx->new();
+    my @data = $xlsx->sheetdata($xlsxfile,"Tabelle1");
+    my $dataok = 0;
+    my @datax = ();
+    my $colnames = ();
+    foreach my $c (@data){
       
-#       if ($dataok == 1){
-#         my $nc = ();
-#         foreach my $r (sort {$a <=> $b} keys(%{$c})){
+      if ($dataok == 1){
+        my $nc = ();
+        foreach my $r (sort {$a <=> $b} keys(%{$c})){
           
-#           if ($c->{$r} ne "0"){
-#             $nc->{$colnames->{$r}} = $c->{$r};
-#             if ($colnames->{$r} eq "Nom"){
-#               my ($surname,$prename) = $c->{$r} =~ m/^(.+)\s(.+)$/;  
-#               $nc->{prename} = $prename;
-#               $nc->{surname} = $surname;  
-#             }
-#             if ($colnames->{$r} eq "Place"){
-#               $nc->{$colnames->{$r}} =~ s/\.//;
-#             }
-#           }
-#         }
-#         push(@datax,$nc);
-#       }
-#       if (exists($c->{3}) && $c->{3} eq "Nom"){
+          if ($c->{$r} ne "0"){
+            $nc->{$colnames->{$r}} = $c->{$r};
+            if ($colnames->{$r} eq "Nom"){
+              my ($surname,$prename) = $c->{$r} =~ m/^(.+)\s(.+)$/;  
+              $nc->{prename} = $prename;
+              $nc->{surname} = $surname;  
+            }
+            if ($colnames->{$r} eq "Place"){
+              $nc->{$colnames->{$r}} =~ s/\.//;
+            }
+          }
+        }
+        push(@datax,$nc);
+      }
+      if (exists($c->{3}) && $c->{3} eq "Nom"){
         
-#         # print $c;
-#         $dataok = 1;
-#         foreach my $n (keys(%{$c})){
-#           $colnames->{$n} = $c->{$n};
-#         }
-#         #$html->{colnames} = $colnames;
-#       }
+        # print $c;
+        $dataok = 1;
+        foreach my $n (keys(%{$c})){
+          $colnames->{$n} = $c->{$n};
+        }
+        #$html->{colnames} = $colnames;
+      }
       
-#     }
-#     foreach my $dx (@datax){
-#       if (exists($dx->{"OLR ".$p->{rl}})){
-#         print encode("utf-8","select * from rankingdata('".$p->{listname}."','".$p->{season}."',".$p->{rl}.",'".$dx->{surname}."','".$dx->{prename}."',".$dx->{"OLR ".$p->{rl}}.",".$dx->{"Total"}.",".$dx->{"Place"}.");")."\n"; 
-#         #print "select rl2=".$dx->{"OLR ".$p->{rl}}.", WHERE surname='".$dx->{surname}."' and prename='".$dx->{prename}."';"
-#       }
-#     }
\ No newline at end of file
+    }
+    foreach my $dx (@datax){
+      if (exists($dx->{"OLR ".$p->{rl}})){
+        print encode("utf-8","select * from rankingdata('".$p->{listname}."','".$p->{season}."',".$p->{rl}.",'".$dx->{surname}."','".$dx->{prename}."',".$dx->{"OLR ".$p->{rl}}.",".$dx->{"Total"}.",".$dx->{"Place"}.");")."\n"; 
+        #print "select rl2=".$dx->{"OLR ".$p->{rl}}.", WHERE surname='".$dx->{surname}."' and prename='".$dx->{prename}."';"
+      }
+    }
\ No newline at end of file