Refactor markup and creole_wiki
This commit is contained in:
@@ -8,7 +8,8 @@ use Data::Dumper;
|
||||
use markup();
|
||||
|
||||
use base 'Exporter';
|
||||
our @EXPORT_OK = qw(extractEventFromWikiText removeMeta eventToWikiText extractMeta removeMeta metaToWiki);
|
||||
our @EXPORT_OK =
|
||||
qw(extractEventFromWikiText removeMeta eventToWikiText extractMeta removeMeta metaToWiki);
|
||||
|
||||
#convert creole wiki text to event
|
||||
sub extractEventFromWikiText($;$) {
|
||||
@@ -157,6 +158,7 @@ sub eventToWikiText($$) {
|
||||
my $meta = extractMeta( $event->{comments}, $event->{meta} );
|
||||
$event->{comments} = removeMeta( $event->{comments} );
|
||||
$event->{wiki_comments} = $event->{comments} . "\n\n" . metaToWiki($meta);
|
||||
|
||||
#markup editors
|
||||
$event->{wiki_content} = $event->{content};
|
||||
|
||||
@@ -165,8 +167,10 @@ sub eventToWikiText($$) {
|
||||
$event->{wiki_content} =~
|
||||
s/\[\[.*?\/+media\/+images\/+(.*?)\s*\|.*?\{\{.*?\/+media\/+thumbs\/+(.*?)\s*\|\s*(.*?)\s*\}\}\]\]/\{\{thumbs\/$1\|$3\}\}/g;
|
||||
|
||||
my $wiki_content = join( "\n" . ( "-" x 20 ) . "\n", ( $event->{excerpt}, $event->{wiki_content} ) );
|
||||
$wiki_content .= "\n" . ( "-" x 20 ) . "\n" . $event->{wiki_comments} if ( $event->{wiki_comments} =~ /\S/ );
|
||||
my $wiki_content =
|
||||
join( "\n" . ( "-" x 20 ) . "\n", ( $event->{excerpt}, $event->{wiki_content} ) );
|
||||
$wiki_content .= "\n" . ( "-" x 20 ) . "\n" . $event->{wiki_comments}
|
||||
if ( $event->{wiki_comments} =~ /\S/ );
|
||||
|
||||
return {
|
||||
title => $title,
|
||||
@@ -202,7 +206,10 @@ sub extractMeta ($$){
|
||||
$value =~ s/^\s+|\s+$//g;
|
||||
|
||||
#insert into list, if not defined yet
|
||||
unless ( ( $name eq '' ) || ( $value eq '' ) || ( exists $meta_keys->{ $name . '=' . $value } ) ) {
|
||||
unless ( ( $name eq '' )
|
||||
|| ( $value eq '' )
|
||||
|| ( exists $meta_keys->{ $name . '=' . $value } ) )
|
||||
{
|
||||
push @$meta,
|
||||
{
|
||||
name => $name,
|
||||
|
||||
@@ -48,6 +48,7 @@ sub html_to_creole($) {
|
||||
$s =~ s/<\/?option.*?//gi;
|
||||
$s =~ s/<\/?input.*?>//gi;
|
||||
$s =~ s/<\/?script.*?>//gi;
|
||||
|
||||
#remove line breaks
|
||||
$s =~ s/[\r\n]+/ /gi;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user