Changeset 302

Timestamp:

05/20/06 09:54:13 (6 years ago)

Author:

dom

Message:

Clean up after Nick, mutter mutter

Location:

wiki-toolkit/trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Wiki/Toolkit.pm (modified) (1 diff)
• lib/Wiki/Toolkit/Store/Database.pm (modified) (3 diffs)
• t/040_rename.t (modified) (1 diff)
• t/152_pre_plugin_approval.t (modified) (4 diffs)

wiki-toolkit/trunk/MANIFEST

@@ -11 +11 @@
 lib/Wiki/Toolkit/Extending.pod
 lib/Wiki/Toolkit/Feed/Atom.pm
+lib/Wiki/Toolkit/Feed/Listing.pm
 lib/Wiki/Toolkit/Feed/RSS.pm
 lib/Wiki/Toolkit/Formatter/Default.pm

wiki-toolkit/trunk/lib/Wiki/Toolkit.pm

@@ -291 +291 @@
     my $ret = $self->store->rename_node( %args );
 
-        if($ret == -1) { return $ret; }
+        if($ret && $ret == -1) { return $ret; }
         return 1;
 }

wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm

@@ -123 +123 @@
         my ($running_total_ref,$result) = @_;
 
-        if($result == 0 || $result == undef) {
+        if(($result && $result == 0) || !$result) {
                 # No opinion, no need to change things
         } elsif($result == -1 || $result == 1) {
@@ -1438 +1438 @@
 
         # If they only gave us the node name, get the node id
-    $sql = "SELECT id FROM node WHERE name=" . $dbh->quote($name);
-    my ($node_id) = $dbh->selectrow_array($sql);
+    unless ($node_id) {
+        $sql = "SELECT id FROM node WHERE name=" . $dbh->quote($name);
+        $node_id = $dbh->selectrow_array($sql);
+    }
 
         # If they didn't tell us what they wanted / we couldn't find it, 
@@ -1447 +1449 @@
 
         # Build up our SQL
-        my $sql = "SELECT id, name, content.version, content.modified ";
+        $sql = "SELECT id, name, content.version, content.modified ";
         if($with_content) {
                 $sql .= ", content.text ";

wiki-toolkit/trunk/t/040_rename.t

@@ -133 +133 @@
 
         # Check the other two nodes
-        my %anode1 = $wiki->retrieve_node("NodeOne");
+        %anode1 = $wiki->retrieve_node("NodeOne");
         is( "This is the second version of the first node, which links to NodeTwo, NodeThree, [NodeTwo], [NodeFour|Node Four] and [NodeThree | Node Three].", $anode1{'content'}, "explicit link was updated, implicit not" );
         is( 3, $anode1{'version'}, "new version" );

wiki-toolkit/trunk/t/152_pre_plugin_approval.t

@@ -74 +74 @@
 
                 # Try to Rename
-                my $ok = $wiki->rename_node( old_name=>"Test Node 2", new_name=>"ren" )
+                $ok = $wiki->rename_node( old_name=>"Test Node 2", new_name=>"ren" )
             or die "Can't rename node";
                 is($plugin->{__pre_rename_called}, 1, "Plugin was called");
@@ -80 +80 @@
 
                 # Check it really wasn't
-                my %node = $wiki->retrieve_node("Test Node 2");
+                %node = $wiki->retrieve_node("Test Node 2");
                 is($node{'version'}, 1, "Node correctly retrieved");
 
@@ -95 +95 @@
 
                 # Try to Add
-                my $ok = $wiki->write_node( "Test Node 4", "bar" )
+                $ok = $wiki->write_node( "Test Node 4", "bar" )
             or die "Can't add node";
                 is($plugin->{__pre_write_called}, 1, "Plugin was called");
@@ -101 +101 @@
 
                 # Check it really wasn't
-                my %node = $wiki->retrieve_node("Test Node 4");
+                %node = $wiki->retrieve_node("Test Node 4");
                 is($node{'version'}, 0, "Node wasn't added");
                 is($node{'content'}, '', "Node wasn't added");