kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor markup and creole_wiki

Browse Source
This commit is contained in:
Milan
2020-03-01 22:48:01 +01:00
parent b9f0870955
commit 9860eee1e2
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/calcms/creole_wiki.pm
View File

@@ -8,7 +8,8 @@ use Data::Dumper;
use markup(); use markup();
use base 'Exporter'; 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 #convert creole wiki text to event
sub extractEventFromWikiText($;$) { sub extractEventFromWikiText($;$) {
@@ -157,6 +158,7 @@ sub eventToWikiText($$) {
my $meta = extractMeta( $event->{comments}, $event->{meta} ); my $meta = extractMeta( $event->{comments}, $event->{meta} );
$event->{comments} = removeMeta( $event->{comments} ); $event->{comments} = removeMeta( $event->{comments} );
$event->{wiki_comments} = $event->{comments} . "\n\n" . metaToWiki($meta); $event->{wiki_comments} = $event->{comments} . "\n\n" . metaToWiki($meta);
#markup editors #markup editors
$event->{wiki_content} = $event->{content}; $event->{wiki_content} = $event->{content};
@@ -165,8 +167,10 @@ sub eventToWikiText($$) {
$event->{wiki_content} =~ $event->{wiki_content} =~
s/\[\[.*?\/+media\/+images\/+(.*?)\s*\|.*?\{\{.*?\/+media\/+thumbs\/+(.*?)\s*\|\s*(.*?)\s*\}\}\]\]/\{\{thumbs\/$1\|$3\}\}/g; 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} ) ); my $wiki_content =
$wiki_content .= "\n" . ( "-" x 20 ) . "\n" . $event->{wiki_comments} if ( $event->{wiki_comments} =~ /\S/ ); 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 { return {
title => $title, title => $title,
@@ -202,7 +206,10 @@ sub extractMeta ($$){
$value =~ s/^\s+|\s+$//g; $value =~ s/^\s+|\s+$//g;
#insert into list, if not defined yet #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, push @$meta,
{ {
name => $name, name => $name,

1
lib/calcms/markup.pm
View File

@@ -48,6 +48,7 @@ sub html_to_creole($) {
$s =~ s/<\/?option.*?//gi; $s =~ s/<\/?option.*?//gi;
$s =~ s/<\/?input.*?>//gi; $s =~ s/<\/?input.*?>//gi;
$s =~ s/<\/?script.*?>//gi; $s =~ s/<\/?script.*?>//gi;
#remove line breaks #remove line breaks
$s =~ s/[\r\n]+/ /gi; $s =~ s/[\r\n]+/ /gi;