Changeset 349

Timestamp:

05/08/04 14:45:32 (5 years ago)

Author:

ivorw

Message:

Diff change - use CGI::Wiki::Plugin::Diff not OpenGuides::Diff

Location:

trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/OpenGuides/Diff.pm (deleted)
• t/51_diff.t (modified) (1 diff)
• wiki.cgi (modified) (5 diffs)

trunk/Changes

@@ -50 +50 @@
         Removed newlines from output of search box macro.
 
+        Implemented the diffing using CGI::Wiki::Plugin::Diff. (seems change
+        in 0.30 was lost). Removed OpenGuides::Diff.pm as we should not be
+        distributing it.
+
 0.30    29 December 2003
         Added method to allow admins to delete nodes.  You will need to

trunk/MANIFEST

@@ -12 +12 @@
 lib/OpenGuides/Build.pm
 lib/OpenGuides/CGI.pm
-lib/OpenGuides/Diff.pm
 lib/OpenGuides/RDF.pm
 lib/OpenGuides/SuperSearch.pm

trunk/t/51_diff.t

@@ -3 +3 @@
 use OpenGuides::Utils;
 use Test::MockObject;
-use Test::More tests => 6;
-
+#use Test::More tests => 6;
+use Test::More skip_all => "Tests for diff are in CGI::Wiki::Plugin::Diff";
 use_ok( "OpenGuides::Diff" );
 

trunk/wiki.cgi

@@ -14 +14 @@
 use CGI::Wiki::Plugin::GeoCache;
 use CGI::Wiki::Plugin::Locator::UK;
+use CGI::Wiki::Plugin::Diff;
 use Config::Tiny;
 use Geography::NationalGrid;
@@ -20 +21 @@
 use OpenGuides::RDF;
 use OpenGuides::Utils;
-use OpenGuides::Diff;
 use OpenGuides::Template;
 use Time::Piece;
@@ -37 +37 @@
 $script_url .= "/" unless $script_url =~ /\/$/;
 
-my ($wiki, $formatter, $locator, $q);
+my ($wiki, $formatter, $locator, $q, $differ);
 eval {
     $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
@@ -43 +43 @@
     $locator = CGI::Wiki::Plugin::Locator::UK->new;
     $wiki->register_plugin( plugin => $locator );
+
+    $differ = CGI::Wiki::Plugin::Diff->new;
+    $wiki->register_plugin( plugin => $differ );
 
     # Get CGI object, find out what to do.
@@ -134 +137 @@
             my $other_ver = $q->param("diffversion");
             if ( $other_ver ) {
-                my %diff_vars = OpenGuides::Diff->formatted_diff_vars(
-                    wiki     => $wiki,
-                    node     => $node,
-                    versions => [ $version, $other_ver ]
+                my %diff_vars = $differ->differences(
+                    node          => $node,
+                    left_version  => $version, 
+                    right_version => $other_ver 
                 );
                 print OpenGuides::Template->output(