Do not require an extra pit parameter when a row is available

[lyx.git] / development / checkurls / search_url.pl

diff --git a/development/checkurls/search_url.pl b/development/checkurls/search_url.pl
index c656dfe92e52ef886a98584a05127a2de0678155..8bba11c1fc50ca3a6fdb0a996d0ddc632dca115c 100755 (executable)
--- a/development/checkurls/search_url.pl
+++ b/development/checkurls/search_url.pl
@@ -103,6 +103,8 @@ for my $arg (@ARGV) {
 }
 
 my @urls = sort keys %URLS, keys %extraURLS;
+# Tests
+#my @urls = ("ftp://ftp.edpsciences.org/pub/aa/readme.html", "ftp://ftp.springer.de/pub/tex/latex/compsc/proc/author");
 my $errorcount = 0;
 
 my $URLScount = 0;
@@ -112,7 +114,15 @@ for my $u (@urls) {
     $ignoredURLS{$u}->{count} += 1;
     next;
   }
-  next if (defined($knownToRegisterURLS{$u}));
+  my $use_curl = 0;
+  if (defined($knownToRegisterURLS{$u})) {
+    if ($knownToRegisterURLS{$u}->{use_curl}) {
+      $use_curl = 1;
+    }
+    else {
+      next;
+    }
+  }
   if (defined($selectedURLS{$u})) {
     ${selectedURLS}{$u}->{count} += 1;
   }
@@ -121,7 +131,7 @@ for my $u (@urls) {
   print "Checking '$u': ";
   my ($res, $prnt, $outSum);
   try {
-    $res = check_url($u);
+    $res = check_url($u, $use_curl);
     if ($res) {
       print "Failed\n";
       $prnt = "";
@@ -224,8 +234,12 @@ sub readUrls($\%)
     $l =~ s/\s*\#.*$//;                # remove comment
     $l = &replaceSpecialChar($l);
     next if ($l eq "");
+    my $use_curl = 0;
+    if ($l =~ s/^\s*UseCurl\s*//) {
+      $use_curl = 1;
+    }
     if (! defined($rUrls->{$l} )) {
-      $rUrls->{$l} = {$file => $line, count => 1};
+      $rUrls->{$l} = {$file => $line, count => 1, use_curl => $use_curl};
     }
   }
   close(ULIST);