Skip to content

Commit

Permalink
Item8057: final rebranding
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.foswiki.org/trunk/MediaWikiToFoswikiContrib@2358 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Feb 4, 2009
1 parent a664116 commit a21d789
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 61 deletions.
16 changes: 8 additions & 8 deletions lib/Foswiki/Contrib/MediaWikiToFoswikiContrib.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2006-2007 Michael Daum http://wikiring.de
# Copyright (C) 2006-2009 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand All @@ -11,18 +11,18 @@
# GNU General Public License for more details, published at
# http://www.gnu.org/copyleft/gpl.html

package TWiki::Contrib::MediaWikiToTWikiAddOn;
package Foswiki::Contrib::MediaWikiToFoswikiContrib;

use strict;
use vars qw( $VERSION $RELEASE $SHORTDESCRIPTION );

$VERSION = '$Rev$';
$RELEASE = 'v1.0';
$SHORTDESCRIPTION = 'MediaWiki 2 TWiki Conversion Tool';
$SHORTDESCRIPTION = 'MediaWiki 2 Foswiki Conversion Tool';

use Getopt::Long;
use Pod::Usage;
use TWiki::Contrib::MediaWikiToTWikiAddOn::Converter;
use Foswiki::Contrib::MediaWikiToFoswikiContrib::Converter;

##############################################################################
sub main {
Expand Down Expand Up @@ -70,19 +70,19 @@ sub main {
) or pod2usage(2);

unless (defined
$TWiki::Contrib::MediaWikiToTWikiAddOn::Converter::language{$args{language}}) {
$Foswiki::Contrib::MediaWikiToFoswikiContrib::Converter::language{$args{language}}) {
print STDERR "ERROR: unknown language $args{language}. Known languages are: ".
join(', ', sort keys %TWiki::Contrib::MediaWikiToTWikiAddOn::language).
join(', ', sort keys %Foswiki::Contrib::MediaWikiToFoswikiContrib::language).
"\n";
exit;
}

pod2usage(-exitval =>1,
-verbose=>2,
-message => "\nThe MEDIAWIKI 2 TWiki Conversion Tool\n"
-message => "\nThe MEDIAWIKI 2 Foswiki Conversion Tool\n"
) if $help;

my $converter = TWiki::Contrib::MediaWikiToTWikiAddOn::Converter->new(%args);
my $converter = Foswiki::Contrib::MediaWikiToFoswikiContrib::Converter->new(%args);
#$converter->writeInfo();
$converter->convert();
}
Expand Down
46 changes: 23 additions & 23 deletions lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/Converter.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2006-2008 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2006-2009 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand All @@ -11,7 +11,7 @@
# GNU General Public License for more details, published at
# http://www.gnu.org/copyleft/gpl.html

package TWiki::Contrib::MediaWikiToTWikiAddOn::Converter;
package Foswiki::Contrib::MediaWikiToFoswikiContrib::Converter;

use strict;
use vars qw(%language $attachmentTemplate
Expand Down Expand Up @@ -40,7 +40,7 @@ BEGIN {
);
}

use TWiki::Time;
use Foswiki::Time;
use Digest::MD5 qw(md5_hex);
use File::Copy;
use Parse::MediaWikiDump;
Expand Down Expand Up @@ -89,7 +89,7 @@ sub new {
$this->{callbacks} = {};
$this->{categories} = {};
$this->{titleCache} = {};
#$this->{session} = new TWiki;
#$this->{session} = new Foswiki;

$this = bless($this, $class);

Expand Down Expand Up @@ -186,14 +186,14 @@ sub createWeb {
my $parentWeb = '';
foreach my $web (@parentWebs) {
$parentWeb .= "/$web";
my $parentWebDir = $TWiki::cfg{DataDir}.$parentWeb;
my $parentWebDir = $Foswiki::cfg{DataDir}.$parentWeb;
unless (-d $parentWebDir) {
$this->createWeb($parentWeb);
}
}

# create data dir
my $dataDir = $TWiki::cfg{DataDir}.$parentWeb.'/'.$webName;
my $dataDir = $Foswiki::cfg{DataDir}.$parentWeb.'/'.$webName;
unless (-d $dataDir) {
if ($this->{dry}) {
#$this->writeDebug("would create directory $dataDir");
Expand All @@ -203,7 +203,7 @@ sub createWeb {
}

# create pub dir
my $pubDir = $TWiki::cfg{PubDir}.'/'.$parentWeb.'/'.$webName;
my $pubDir = $Foswiki::cfg{PubDir}.'/'.$parentWeb.'/'.$webName;
unless (-d $pubDir) {
if ($this->{dry}) {
#$this->writeDebug("would create directory $pubDir");
Expand All @@ -212,7 +212,7 @@ sub createWeb {
}
}

my $defaultWeb = $TWiki::cfg{DataDir}.'/'.$this->{defaultWeb};
my $defaultWeb = $Foswiki::cfg{DataDir}.'/'.$this->{defaultWeb};
opendir (DIR,$defaultWeb) or die "can't open default web $defaultWeb: $!";
my @defaultTopics = grep { /\.txt$/ && ! -f "$dataDir/$_" } readdir(DIR);
closedir DIR;
Expand Down Expand Up @@ -464,7 +464,7 @@ sub saveTopic {
my $author;
my $date;
if ($page) {
$date = TWiki::Time::parseTime($page->timestamp);
$date = Foswiki::Time::parseTime($page->timestamp);
$author = $page->username || 'UnknownUser';
} else {
$author = 'UnknownUser';
Expand All @@ -485,9 +485,9 @@ sub saveTopic {
# create file
$web =~ s/\./\//go;
$web =~ s/\/$//go;
my $topicFileName = $TWiki::cfg{DataDir}.'/'.$web.'/'.$topic.'.txt';
my $topicFileName = $Foswiki::cfg{DataDir}.'/'.$web.'/'.$topic.'.txt';

my $defaultWebFileName = $TWiki::cfg{DataDir}.'/'.$this->{defaultWeb}.'/'.$topic.'.txt';
my $defaultWebFileName = $Foswiki::cfg{DataDir}.'/'.$this->{defaultWeb}.'/'.$topic.'.txt';

if (-f $topicFileName && ! -f $defaultWebFileName && ! $this->{cummulative}) { # overwriting default topics is ok
my $index = 0;
Expand Down Expand Up @@ -857,11 +857,11 @@ sub handleTemplateCall {
$webName ||= $this->{language}{Template};
my $webTopicName = "$webName.$topicName";

# OUTCH: convert links in template as they are handled differently in MediaWiki and TWiki:
# OUTCH: convert links in template as they are handled differently in MediaWiki and Foswiki:
# links in a transcluded page are resolved locally/early in TW while resolved lately
# in MW. Example: Given you have a transclusion in an article in the Main namespace/web
# of another article called 'Template:A'. Now Template:A has a link [[B]] in it. In MW it
# will create a link to Main:B while linking to Template:B in TWiki
# will create a link to Main:B while linking to Template:B in Foswiki

# build (parametrized) INCLUDE
my $result = '%INCLUDE{"'.$webTopicName.'"'; # TODO: how do we get the templates
Expand Down Expand Up @@ -1005,8 +1005,8 @@ sub attachMedia {

# cope with attachments that have umlauts in their name
my $utf8file = $file;
$utf8file = to_utf8(-string=>$utf8file, -charset=>$TWiki::cfg{Site}{CharSet})
if $TWiki::cfg{Site}{CharSet} !~ /^utf-?8$/i;
$utf8file = to_utf8(-string=>$utf8file, -charset=>$Foswiki::cfg{Site}{CharSet})
if $Foswiki::cfg{Site}{CharSet} !~ /^utf-?8$/i;

my $key = md5_hex($utf8file);
my $source = $this->{images}.'/'.substr($key,0,1).'/'.substr($key,0,2).'/'.$utf8file;
Expand All @@ -1027,7 +1027,7 @@ sub attachMedia {
my $webTopicName = "$web.$topic";
$webTopicName =~ s/\./\//g;

my $pubDir = $TWiki::cfg{PubDir}.'/'.$webTopicName;
my $pubDir = $Foswiki::cfg{PubDir}.'/'.$webTopicName;
unless (-d $pubDir) {
if ($this->{dry}) {
#$this->writeDebug("would create directory $pubDir");
Expand All @@ -1040,8 +1040,8 @@ sub attachMedia {
}
}
my $target = $pubDir.'/'.$file;
$target = from_utf8(-string=>$target, -charset=>$TWiki::cfg{Site}{CharSet})
unless $TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/i;
$target = from_utf8(-string=>$target, -charset=>$Foswiki::cfg{Site}{CharSet})
unless $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8$/i;

if ($this->{dry}) {
$this->writeDebug("would copy media file $source to $target");
Expand Down Expand Up @@ -1202,7 +1202,7 @@ sub convertAnchor {
#$this->writeDebug("before anchor=$anchor");

$anchor =~ s/\.[A-F0-9][A-F0-9]\.[A-F0-9][A-F0-9]/_/go;
$anchor =~ s/[^$TWiki::regex{mixedAlphaNum}]+/_/g;
$anchor =~ s/[^$Foswiki::regex{mixedAlphaNum}]+/_/g;
$anchor =~ s/__+/_/g;
$anchor = substr($anchor, 0, 32);

Expand All @@ -1216,8 +1216,8 @@ sub getPageText {
my ($this, $page) = @_;

my $text = ${$page->text};
$text = from_utf8(-string=>$text, -charset=>$TWiki::cfg{Site}{CharSet})
unless $TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/i;
$text = from_utf8(-string=>$text, -charset=>$Foswiki::cfg{Site}{CharSet})
unless $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8$/i;

return $text;
}
Expand All @@ -1227,7 +1227,7 @@ sub getCamelCase {
my ($this, $name) = @_;

my $result = '';
foreach my $part (split(/[^$TWiki::regex{mixedAlphaNum}]/, $name)) {
foreach my $part (split(/[^$Foswiki::regex{mixedAlphaNum}]/, $name)) {
$result .= ucfirst($part);
}

Expand All @@ -1239,7 +1239,7 @@ sub getCategoryName {
my ($this, $name) = @_;

my $result = '';
foreach my $part (split(/[^$TWiki::regex{mixedAlphaNum}]/, $name)) {
foreach my $part (split(/[^$Foswiki::regex{mixedAlphaNum}]/, $name)) {
$result .= ucfirst(lc($part));
}

Expand Down
10 changes: 5 additions & 5 deletions lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/EmptyPlugin.pm
View file
@@ -1,10 +1,10 @@
# Plugin for mediawiki2twiki
# Plugin for mediawiki2foswiki
#
# Copyright (C) 2007 Michael Daum http://wikiring.de
# Copyright (C) 2007-2009 Michael Daum http://michaeldaumconsulting.com
#
# Copy/Rename this file to YourOwnPlugin.pm and rename the package line below

package TWiki::Contrib::MediaWiki2TWikiAddOn::EmptyPlugin;
package Foswiki::Contrib::MediaWiki2FoswikiContrib::EmptyPlugin;
use strict;

##############################################################################
Expand All @@ -27,7 +27,7 @@ sub DISABLED_handleInit {
}

##############################################################################
# called when the title of a mediawiki is converted to a TopicTitle for TWiki
# called when the title of a mediawiki is converted to a TopicTitle
sub DISABLED_handleTitle {
my $converter = shift;
my $page = shift;
Expand Down Expand Up @@ -57,7 +57,7 @@ sub DISABLED_handleBefore {
}

##############################################################################
# called after a page has been converted to a TWiki topic
# called after a page has been converted to a topic
sub DISABLED_handleAfter {
my $converter = shift;
my $page = shift;
Expand Down
17 changes: 8 additions & 9 deletions lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/MANIFEST
View file
@@ -1,10 +1,9 @@
data/TWiki/MediaWikiToTWikiAddOn.txt 0644
data/System/MediaWikiToFoswikiContrib.txt 0644
lib/CPAN/lib/Parse/MediaWikiDump.pm 0644
lib/TWiki/Contrib/MediaWikiToTWikiAddOn/Converter.pm 0644
lib/TWiki/Contrib/MediaWikiToTWikiAddOn/EmptyPlugin.pm 0644
lib/TWiki/Contrib/MediaWikiToTWikiAddOn/build.pl 0644
lib/TWiki/Contrib/MediaWikiToTWikiAddOn.pm 0644
pub/TWiki/MediaWikiToTWikiAddOn/schenck_logo.gif 0644
pub/TWiki/MediaWikiToTWikiAddOn/wikiringlogo40x40.png 0644
tools/EmptyMediaWiki2TWikiPlugin.pm 0755
tools/mediawiki2twiki 0755
lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/Converter.pm 0644
lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/EmptyPlugin.pm 0644
lib/Foswiki/Contrib/MediaWikiToFoswikiContrib.pm 0644
pub/System/MediaWikiToFoswikiContrib/schenck_logo.gif 0644
pub/System/MediaWikiToFoswikiContrib/wikiringlogo40x40.png 0644
tools/EmptyMediaWiki2FoswikiPlugin.pm 0755
tools/mediawiki2foswiki 0755
18 changes: 2 additions & 16 deletions lib/Foswiki/Contrib/MediaWikiToFoswikiContrib/build.pl
View file
Expand Up @@ -2,24 +2,10 @@
BEGIN {
unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
}
use TWiki::Contrib::Build;
use Foswiki::Contrib::Build;

# Create the build object
$build = new TWiki::Contrib::Build('MediaWikiToTWikiAddOn');

# (Optional) Set the details of the repository for uploads.
# This can be any web on any accessible TWiki installation.
# These defaults will be used when expanding tokens in .txt
# files, but be warned, they can be overridden at upload time!

# name of web to upload to
$build->{UPLOADTARGETWEB} = 'Extensions';
# Full URL of pub directory
$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub';
# Full URL of bin directory
$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin';
# Script extension
$build->{UPLOADTARGETSUFFIX} = '';
$build = new Foswiki::Contrib::Build('MediaWikiToFoswikiContrib');

# Build the target on the command line, or the default target
$build->build($build->{target});
Expand Down

0 comments on commit a21d789

Please sign in to comment.