ddts-script v 0.2.3

[Nicolas Bertolissio <nico.bertol@wanadoo.fr>]

Bonjour,

changelog :
version 0.2.3
  - add: translator address in file to review (new in ddts)
  - bug fix:
    - change: put right comments on short description when parsing bug report
      thanks to Philippe Trbich for reporting this bug

Autre nouveauté sur le serveur, il ne prend désormais en compte que la
partie utile de l'adresse, c'est-à-dire que « nico.bertol@wanadoo.fr »,
« N. Bertolissio <nico.bertol@wanadoo.fr> », « Nicolas Bertolissio
<nico.bertol@wanadoo.fr> », etc. sont considérées comme une seule et
même adresse (ce qui est logique).

La rustine est jointe, le script complet toujours au même endroit :
http://perso.wanadoo.fr/nico.bertol/ddts/ddts-script.txt

Pour ceux qui utilisent vim, les fichiers de syntaxe pour la v. 6 sont à
jour ici :
http://perso.wanadoo.fr/nico.bertol/ddts/myscripts.vim.txt
http://perso.wanadoo.fr/nico.bertol/ddts/ddts.vim.txt

Nicolas
-- 

--- ddts-script_0.2.2.txt	Sat Dec  1 22:32:19 2001
+++ ddts-script_0.2.3.txt	Sun Dec  2 08:59:03 2001
@@ -226,7 +226,7 @@
 
 =cut
 
-my $version = "0.2.2";
+my $version = "0.2.3";
 
 # Test if configuration as been made
 foreach ($tr_dir, $bug_dir, $rev_dir, $temp_dir) {
@@ -533,6 +533,7 @@
 
 	my $package;
 	my $reviewer_addr;
+	my $translator_addr;
 	my $bug_number;
 	my $langage;
 	my $description;
@@ -564,6 +565,14 @@
 			next;
 		}
 
+		if (defined && /^# Translator: /) {
+			chomp($translator_addr = $');
+
+			$debug   && $debug<3 && print "translator:   $translator_addr\n";
+			$debug>2             && print "    translator:   $translator_addr\n";
+			next;
+		}
+
 		if (defined && /^# Bug-Nr.: (\d+)/) {
 			chomp ($bug_number = $1);
 
@@ -646,7 +655,7 @@
 			if ($uu_file eq "$temp_dir/ddts-new-$$") {
 				&parse_translation($package, $langage, $description, $translation, $db_translation, $message_id);
 			} elsif ($uu_file eq "$temp_dir/ddts-newreview-$$") {
-				&parse_review($package, $langage, $description, &uncomment($translation, "## "), $message_id);
+				&parse_review($package, $langage, $translator_addr, $description, &uncomment($translation, "## "), $message_id);
 # DDTS ------------------------------------------------------------------------ $translation ------------------
 			} elsif ($uu_file eq "$temp_dir/ddts-reviewed-$$") {
 				&parse_reviewed($package);
@@ -706,6 +715,7 @@
 sub parse_review {
 	my $package	   = shift;
 	my $langage	   = shift;
+	my $translator	   = shift;
 	my $description	   = shift;
 	my $translation	   = &uncomment(shift, "## ");
 	my $message_id     = shift;
@@ -713,14 +723,16 @@
 	$debug>2 && print "parse_review\n";
 	$debug>3 && print "    package:      $package\n";
 	$debug>3 && print "    langage:      $langage\n";
+	$debug>3 && print "    translator:   $translator\n";
 	$debug>3 && print "    message id:   $message_id\n";
 
 	&move_file  ("$rev_dir/$package.$ok_e",   "$rev_dir/$package.$sent_e");
 	&move_file  ("$rev_dir/$package.$rev_e",  "$rev_dir/$package.$sent_e");
 	&move_file  ("$rev_dir/$package.$sent_e", "$rev_dir/$package.$old_e");
 
-	my $todo = "# Package: $package\n"
-		  ."# ddts id: $message_id\n"
+	my $todo = "# Package:    $package\n"
+		  ."# Translator: $translator\n"
+		  ."# ddts id:    $message_id\n"
 		  ."Description: $description"
 		  ."Description-$langage\: $translation";
 
@@ -745,9 +757,14 @@
 				$todo = &get_header("$rev_dir/$package")
 		  		       ."Description: $description";
 				my @diff = split ("\n", &superdiff($original, $reviewed));
+	print "0".$diff[0]."\n";
 				if ($diff[0] =~ /^$comment-/) {
+	print "0".$diff[0]."\n";
+	print "1".$diff[1]."\n";
 					$diff[0] =~ s/^$comment-//;
 					$diff[1] =~ s/^$comment\+//;
+	print "0".$diff[0]."\n";
+	print "1".$diff[1]."\n";
 					$todo .= "$comment-Description-$langage\: ".$diff[0]."\n"
 					        ."$comment+Description-$langage\: ".$diff[1]."\n";
 					shift @diff;
@@ -859,7 +876,12 @@
 		@diff = split("\n", &superdiff($old_description, $description));
 		@diff = map  {  /^$comment\+/?$':$_ } @diff;
 		@diff = map  {  /^$comment-/?"# -$'":$_ } @diff;
-		$description=join("\n", @diff)."\n";
+		$description = "";
+		if ($diff[0] =~ /^# -/) {
+			$description = "# -Description: $'\n";
+			shift @diff;
+		}
+		$description .= "Description: ".join("\n", @diff)."\n";
 	}
 
 	# Re-format review for superdiff