Tags:
usability1Add my vote for this tag user_interface1Add my vote for this tag version_control2Add my vote for this tag create new tag
view all tags

Compare Revisions Add-On

Compares two revisions of a document

Introduction

This add-on compares the rendered HTML output of two revisions and shows the differences broken down to the word-by-word level if necessary. The output can be formatted by templates and skins.

Description

The CompareRevisionsAddOn compares two revisions of a document, like rdiff does. But in contrast to normal rdiff, the comparison is done with the rendered HTML output of the revisions instead of the TWiki source text files. (This feature was proposed by many of our users, who found the normal rdiff output too technical - even with the sidebyside option - and wanted to see differences in the content of the page).

Furthermore, the differences between the revisions are shown as close as possible. If necessary, this means that different words are marked instead of whole lines or even paragraphs.

The differences may be shown in two formats, either side-by-side or as an interwoven output of the old and new revision (like it is done in Word or OpenOffice):

  • Screenshot of interwoven output:
    interweave.png

  • Screenshot of side-by-side output:
    sidebyside.png

These screenshots have been taken from CompareRevisionsAddOnDemoTopic.

The appearance can be affected by templates and skins.

Usage

Call http://your/twiki/bin/compare/Web/Topic?parameters from your browser

Parameters

rev1=rev and rev2=rev
Revision numbers of the two revisions which should be compared. Defaults to the last two revisions. (More exact: rev2 defaults to the latest edition, rev1 defaults to rev2 - 1)

render=interweave or render=sidebyside
Chooses the output format. May also be given in the preference variable COMPARERENDERSTYLE

context=n
The number n of unchanged sections which should be shown around changed sections. A section means a top-level section like a paragraph, table, etc. If n=-1 (the default), all unchanged sections are shown. May also be given in the preference variable COMPARECONTEXT

skin=someskin
Chooses someskin for the output. See section Templates below

Templates

The output of the script is rendered by templates. Two templates are needed, compare.tmpl (or compare.skin.tmpl) for the side-by-side format, and interweave.tmpl (or interweave.skin.tmpl) for the interwoven format.

The templates itself are broken into 7 parts

template for start of page
%REPEAT%
template for unchanged section 
which is not printed according to context
%REPEAT%
template for unchanged section 
which is printed
%REPEAT%
template for changed section
%REPEAT%
template for added section
%REPEAT%
template for deleted section
%REPEAT%
template for end of page

All empty templates for a section default to their predecessor. (E.g. if you do not specify a template for a deleted section, it defaults to the template for an added section, which in turn may default to the template for a changed section).

In the templates for a section, %TEXT1% is replaced by the text of the old revision and %TEXT2% is replaced by the text of the new revision. In interwoven output, only %TEXT1% is used.

Examples for templates can be found in the default template files from the distribution (compare.tmpl, compare.pattern.tmpl, interweave.tmpl, interweave.pattern.tmpl ).

CSS Styles

The differences in the two revisions are marked with the help of CSS style classes, whose appearance should be defined in the templates.

The following classes are used:

craCompareAdd
Class for added items (i.e. items which are in the newer revision, but not yet in the older one)

craCompareDelete
Class for deleted items (i.e. items which are in the older revision, but no more in the newer one)

craCompareChange1
Class for the items from the older revision which have been changed.

craCompareChange2
Class for the items from the newer revision which have been changed.

In the default templates files from the distribution, the classes craCompareAdd and craCompareChange1 are defined with a light red background and stroken out text, and craCompareDelete and craCompareChange2 are defined with a light green background.

Add-On Installation Instructions

Note: You do not need to install anything on the browser to use this add-on. The following instructions are for the administrator who installs the add-on on the server where TWiki is running.

  • This script needs some additional Perl modules. If necessary, download and install the required perl modules from CPAN. If you do not want to install these modules in your standard perl location, install them in /your/twiki/lib. (See e.g. perldoc perlmodinstall on how to install perl modules).
    These modules are required:
    • HTML::Tree (with HTML::TreeBuilder and HTML::Element). These modules in turn need
    • Algorithm::Diff (which is included in the standard TWiki installation
  • Download the zip file from the add-on Home (see below)
  • Unzip CompareRevisionsAddOn.zip in your TWiki installation directory. Content:
    File: Description:
    data/TWiki/CompareRevisionsAddOn.txt Add-on topic
    bin/compare Add-on script
    lib/TWiki/UI/Compare.pm Perl package used by the script
    templates/compare.tmpl Template for side-by-side output
    templates/compare.pattern.tmpl Same for pattern skin
    templates/interweave.tmpl Template for interwoven output
    templates/interweave.pattern.tmpl Same for pattern skin
    lib/TWiki/Plugins/CompareRevisionsAddonPlugin.pm Helper plugin
    data/TWiki/CompareRevisionsAddonPlugin.txt Plugin topic
    pub/TWiki/CompareRevisionsAddOn/interweaved.png Interwoven screenshot
    pub/TWiki/CompareRevisionsAddOn/sidebyside.png Side-by-side screenshot
    data/Sandbox/CompareRevisionsAddOnDemoTopic.txt Demonstration topic
    data/Sandbox/CompareRevisionsAddOnDemoTopic.txt,v Demonstration topic history

  • Test if the installation was successful:
    Call %SCRIPTURL%/compare/Web/Topic with some existing topic. (Try for instance CompareRevisionsAddOnDemoTopic and compare your output with above screenshots).

  • Enable the helper plugin CompareRevisionsAddonPlugin with the configure script
  • This plugin will support the HistoryPlugin, if it is enabled
  • If you disable this plugin, the skin will behave like standard PatternSkin again

Add-On Info

Plugin Author: TWiki:Main.JChristophFuchs, TWiki:Main.KennethLavrsen
Copyright: © 2005-2006, JChristophFuchs;
© 2008-2010 Kenneth Lavrsen and Foswiki Contributors
© 2006-2010 TWiki:TWiki.TWikiContributor
License: GPL (GNU General Public License)
Version: 2010-11-12
Change History:  
2010-11-12: TWikibug:Item6530: Doc improvements; updated for TWiki-5.0 -- TWiki:Main.PeterThoeny
21 Oct 2010 Added dependency of HTML::Tree to installer and to core MANIFEST so you see it listed in configure
04 Oct 2010 Add CompareRevisionsAddOn.pm stub module to provide Version & Release strings
31 Jul 2010 Paul Harvey: Documentation updates
19 Sep 2009 Kenneth Lavrsen: Expert settings in plugins makes configure fail to save. Using the hidden (H) setting instead which is much better anyway as this is not a setting to be altered by a user.
18 Sep 2009 Kenneth Lavrsen: Expert settings in plugins makes configure fail to save. Settings therefore un-experted again
12 Sep 2009 Kenneth Lavrsen: Fixed problem with tables always showing up as changed even when they were not
22 Mar 2009 Gilmar Santos Jr: ported to TWiki:Codev.TWikiStandAlone architecture
09 Jan 2009 Gilmar Santos Jr: fixed ambigous print
08 Dec 2008 Kenneth Lavrsen: Changed the author to myself. JChristophFuchs is the original author but announced in 2006 that he no longer maintains this plugin. So now I officially take the task as maintainer.
07 Nov 2007 Arthur Clemens: Updated for TWiki 4.2
09 Apr 2006 Updated for new PatternSkin in TWikiRelease04x00x02
26 Feb 2006 Updated for TWiki 4
02 Mar 2005 Corrected bug concerning uninitialized elements
03 Feb 2005 Removed blank paragraphs before comparing
20 Jan 2005 Initial version
CPAN Dependencies: HTML::Parser, HTML::Tagset, HTML::Tree
Other Dependencies: none
Perl Version: 5.008
Add-on Home: http://TWiki.org/cgi-bin/view/Plugins/CompareRevisionsAddOn
Feedback: http://TWiki.org/cgi-bin/view/Plugins/CompareRevisionsAddOnDev
Appraisal: http://TWiki.org/cgi-bin/view/Plugins/CompareRevisionsAddOnAppraisal

Related Topic: CompareRevisionsAddonPlugin

Topic attachments
I Attachment History Action Size Date Who Comment
Unknown file formatmd5 CompareRevisionsAddOn.md5 r6 r5 r4 r3 r2 manage 0.2 K 2010-11-13 - 08:20 PeterThoeny  
Compressed Zip archivetgz CompareRevisionsAddOn.tgz r6 r5 r4 r3 r2 manage 65.7 K 2010-11-13 - 08:20 PeterThoeny  
Compressed Zip archivezip CompareRevisionsAddOn.zip r9 r8 r7 r6 r5 manage 74.7 K 2010-11-13 - 08:20 PeterThoeny  
Unknown file formatext CompareRevisionsAddOn_installer r2 r1 manage 4.0 K 2010-11-13 - 08:20 PeterThoeny  
Edit | Attach | Watch | Print version | History: r24 < r23 < r22 < r21 < r20 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r24 - 2018-07-17 - PeterThoeny
 
  • Learn about TWiki  
  • Download TWiki
This site is powered by the TWiki collaboration platform Powered by Perl Hosted by OICcam.com Ideas, requests, problems regarding TWiki? Send feedback. Ask community in the support forum.
Copyright © 1999-2024 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.