Changeset 14626 in josm for trunk/scripts

Timestamp:

2019-01-01T14:07:43+01:00 (6 years ago)

Author:

stoecker

Message:

see #16123 - support complete style/rule/preset scan using josm server cronjob output

File:

• trunk/scripts/TestHTTPS.pl (modified) (2 diffs)

trunk/scripts/TestHTTPS.pl

@@ -54 +54 @@
   for my $line (<FILE>)
   {
-    if($line =~ /^([^ \t].*);/)
+    if($line =~ /^([^ \t].*);(.*)/)
     {
-      $name = $1;
+      my ($n, $url) = ($1, $2);
+      if($url =~ /josm\.openstreetmap\.de/)
+      {
+        $name = "WIKI$type:$n";
+      }
+      else
+      {
+        $name = "$type:$n";
+      }
     }
     if($line =~ /http:\/\/(.*?)[\/]/)
     {
-      $urls{$1}{"$type:$name"}++;
+      $urls{$1}{$name}++;
     }
   }
+  close FILE;
 }
 
-print "Options: PLUGIN STYLE RULE PRESET MAP GETPLUGIN GETSTYLE GETRULE GETPRESET GETMAP LOCAL\n" if !@ARGV;
+sub getdump()
+{
+  open FILE,"<:encoding(utf-8)","josm_dump.txt" or die;
+  local $/;
+  undef $/;
+  my $file = <FILE>;
+  close FILE;
+  eval $file;
+}
+
+print "Options: \n PLUGIN STYLE RULE PRESET MAP DUMP\n GETPLUGIN GETSTYLE GETRULE GETPRESET GETMAP GETDUMP\n LOCAL\n ALL GETALL\n" if !@ARGV;
 
 open OUTFILE,">","josm_https.txt" or die "Could not open output file";
@@ -78 +97 @@
 for my $ARG (@ARGV)
 {
+  if($ARG eq "ALL") {push(@ARGV, "PLUGIN", "STYLE", "RULE", "PRESET", "MAP", "DUMP");}
+  if($ARG eq "GETALL") {push(@ARGV, "GETPLUGIN", "GETSTYLE", "GETRULE", "GETPRESET", "GETMAP", "GETDUMP");}
+}
+my %ARGS = map {$_ => 1} @ARGV; # prevent double arguments by passing through a hash
+for my $ARG (sort keys %ARGS)
+{
   if($ARG eq "LOCAL") {$local = 1; }
+  if($ARG eq "GETDUMP") { system "scp josm\@josm.openstreetmap.de:auto/httpinfo.dump josm_dump.txt"; getdump();}
+  if($ARG eq "DUMP") { getdump(); }
   if($ARG eq "GETMAP") { system "curl https://josm.openstreetmap.de/maps -o imagery_josm.imagery.xml"; getmaps();}
   if($ARG eq "MAP") { getmaps(); }