From: Thomas Hochstein <thh@inter.net>
Date: Thu, 25 Feb 2010 18:22:15 +0000 (+0100)
Subject: Merge branch 'Options'
X-Git-Tag: v0.6~2
X-Git-Url: https://code.th-h.de/?p=usenet%2Fyapfaq.git;a=commitdiff_plain;h=a0605478dd5e62d6288e82ce45de56b154bf1daf;hp=--cc

Merge branch 'Options'

Conflicts:
	yapfaq.pl
---

a0605478dd5e62d6288e82ce45de56b154bf1daf
diff --cc yapfaq.pl
index 9a7b64f,eb99937..0a541c8
--- a/yapfaq.pl
+++ b/yapfaq.pl
@@@ -84,10 -95,20 +95,16 @@@ foreach (@Config) 
  
    $SupersedeMID = "" unless $Supersede;
  
 -  if ($PFreq =~ /(\d+)\s*([dw])/) { # Is counted in days or weeks: Use Add_Delta_Days.
 -    ($NPY,$NPM,$NPD) = Add_Delta_Days($LPY, $LPM, $LPD, (($2 eq "w")?$1 * 7: $1 * 1));
 -  } elsif ($PFreq =~ /(\d+)\s*([my])/) { #Is counted in months or years: Use Add_Delta_YM
 -    ($NPY,$NPM,$NPD) = Add_Delta_YM($LPY, $LPM, $LPD, (($2 eq "m")?(0,$1):($1,0)));
 -  }
 -    
 +  ($NPY,$NPM,$NPD) = calcdelta ($LPY,$LPM,$LPD,$PFreq);
 +
-   if (Delta_Days($NPY,$NPM,$NPD,$TDY,$TDM,$TDD) >= 0 ) {
-     postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire);
+   if (Delta_Days($NPY,$NPM,$NPD,$TDY,$TDM,$TDD) >= 0 or ($Options{'p'})) {
+     if($Options{'d'}) {
+ 	  print "$ActName: Would be posted now (but running in simulation mode [$0 -d]).\n" if $Options{'v'};
+ 	} else {
 -      postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID);
++      postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire);
+ 	}
+   } elsif($Options{'v'}) {
+     print "$ActName: Nothing to do.\n";
    }
  }
  
@@@ -159,9 -166,13 +182,13 @@@ sub calcdelta 
  # It reads the data-file $File and then posts the article.
  
  sub postfaq {
 -  my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes) = @_;
 +  my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes,$Expire) = @_;
    my (@Header,@Body,$MID,$InRealBody,$LastModified);
  
+   if($Options{'v'}) {
+     print "$$ActName: Preparing to post.\n";
+   }
+   
    #Prepare MID:
    $$TDM = ($$TDM < 10 && $$TDM !~ /^0/) ? "0" . $$TDM : $$TDM;
    $$TDD = ($$TDD < 10 && $$TDD !~ /^0/) ? "0" . $$TDD : $$TDD;