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

Timestamp:

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

Author:

dom

Message:

Clean up after Nick, mutter mutter

Files:

• wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm (modified) (3 diffs)

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 ";