--- tamtam/tamtam2socialtext.pl	2007/12/13 12:42:45	24
+++ tamtam/tamtam2socialtext.pl	2007/12/14 23:46:57	26
@@ -85,6 +85,7 @@
 
 		$page->{ $name } = {
 			content => convert_markup( $data ),
+			original => $data,
 			date => convert_date( $date ),
 			attachments => $attachments,
 		};
@@ -133,9 +134,9 @@
 
 sub pre {
 	my $text = shift;
-	$text =~ s/^{{{//;
-	$text =~ s/}}}$//;
-	return '.pre' . $text . '.pre';
+	$text =~ s/^{{{\s*//s;
+	$text =~ s/\s*}}}$//s;
+	return "\n.pre\n" . $text . "\n.pre\n";
 }
 
 sub convert_markup {
@@ -205,10 +206,13 @@
 
 	Encode::_utf8_off( $body );
 
-	$Rester->put_page( $name, { content => $body, date => $date });
 	print "$name $date\n";
+
+	# original markup
+	$Rester->put_page( $name, { content => $p->{original}, date => $date });
+
 	foreach ( @tags ) {
-		$Rester->put_pagetag( $name, $_ );
+		$Rester->put_pagetag( $name, $_, { date => $date } );
 		print "+ tag $_\n";
 	}
 
@@ -221,5 +225,8 @@
 		}
 	}
 
+	# converted page
+	$Rester->put_page( $name, { content => $body, date => $date });
+
 }