From 959cae82224e799e7bf9f5b8efd2fa9877058dca Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 11 Oct 2001 12:25:25 +0000
Subject: - added sequence tables

- fixed bug in node_page()

- fixed bug in db_result()

- fixed rss glitch
---
 includes/database.inc |  2 +-
 includes/node.inc     | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'includes')

diff --git a/includes/database.inc b/includes/database.inc
index be3bdbf17..a3da55254 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -45,7 +45,7 @@ function db_num_rows($result) {
 
 function db_result($result, $field = 0) {
   if ($result) {
-    $tmp = $result->fetchRow(DB_FETCHMODE_ASSOC);
+    $tmp = $result->fetchRow(DB_FETCHMODE_ORDERED);
     return $tmp[$field];
   }
 }
diff --git a/includes/node.inc b/includes/node.inc
index 747c8d8b4..0fac085e3 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -133,29 +133,29 @@ function node_save($node, $filter) {
       $v2 = implode(", ", $v2);
 
 
-      $result = db_query ("BEGIN");
-      if (db_error ($result)) {
-        watchdog ("error", "database: ". $result->getMessage () ."\nquery: ". htmlspecialchars ("BEGIN"));
+      $result = db_query("BEGIN");
+      if (db_error($result)) {
+        watchdog("error", "database: ". $result->getMessage() ."\nquery: ". htmlspecialchars("BEGIN"));
       }
       else {
 
-        $nid = $db_handle->nextId ("node_nid");
-        $lid = $db_handle->nextId ($filter[type] . "_lid");
+        $nid = $db_handle->nextId("node");
+        $lid = $db_handle->nextId($filter[type]);
 
-        $result = db_query ("INSERT INTO node ($f1, nid, lid) VALUES ($v1, '$nid', '$lid')");
-        if (db_error ($result)) {
+        $result = db_query("INSERT INTO node ($f1, nid, lid) VALUES ($v1, '$nid', '$lid')");
+        if (db_error($result)) {
           watchdog("warning", "node: added $filter[type] '$node[title]' - failed");
         }
         else {
-          $result = db_query ("INSERT INTO $filter[type] ($f2, nid, lid) VALUES ($v2, '$nid', '$lid')");
-          if (db_error ($result)) {
+          $result = db_query("INSERT INTO $filter[type] ($f2, nid, lid) VALUES ($v2, '$nid', '$lid')");
+          if (db_error($result)) {
             watchdog("warning", "node: added $filter[type] '$node[title]' - failed");
           }
           else {
-            $result = db_query ("COMMIT");
-            if (db_error ($result)) {
-              watchdog ("error", "database: ". $result->getMessage () ."\nquery: ". htmlspecialchars ("BEGIN"));
-              $db_handle->rollback ();
+            $result = db_query("COMMIT");
+            if (db_error($result)) {
+              watchdog("error", "database: ". $result->getMessage() ."\nquery: ". htmlspecialchars("BEGIN"));
+              $db_handle->rollback();
             }
             watchdog("special", "node: added $filter[type] '$node[title]'");
           }
-- 
cgit v1.2.3