--- feedapi_node.module 2007-11-30 01:05:05.000000000 +0200 +++ feedapi_node-db_result.module 2007-12-01 23:52:13.000000000 +0200 @@ -27,10 +27,9 @@ function feedapi_node_help($section) { function feedapi_node_nodeapi(&$node, $op, $teaser) { switch ($op) { case 'delete': - $result = db_query("SELECT fiid FROM {feedapi_node_item} WHERE nid = %d", $node->nid); - if (db_num_rows($result) > 0) { - $feed_item = db_fetch_object($result); - _feedapi_node_delete($feed_item); + $result = db_fetch_object(db_query("SELECT fiid FROM {feedapi_node_item} WHERE nid = %d", $node->nid)); + if ($result) { + _feedapi_node_delete($result); } break; } @@ -237,14 +236,14 @@ function _feedapi_node_fetch($feed) { function _feedapi_node_unique($feed_item, $feed_nid) { // Feed item is duplicate, if URL or GUID are duplicate or if they are both missing. if (isset($feed_item->options->original_url)) { - $count = db_num_rows(db_query("SELECT fiid FROM {feedapi_node_item} WHERE url = '%s' AND feed_nid = %d", $feed_item->options->original_url, $feed_nid)); - if ($count > 0) { + $count = db_result(db_query("SELECT fiid FROM {feedapi_node_item} WHERE url = '%s' AND feed_nid = %d", $feed_item->options->original_url, $feed_nid)); + if ($count) { return FALSE; } } if (isset($feed_item->options->guid)) { - $count = db_num_rows(db_query("SELECT fiid FROM {feedapi_node_item} WHERE guid = '%s' AND feed_nid = %d", $feed_item->options->guid, $feed_nid)); - if ($count > 0) { + $count = db_result(db_query("SELECT fiid FROM {feedapi_node_item} WHERE guid = '%s' AND feed_nid = %d", $feed_item->options->guid, $feed_nid)); + if ($count) { return FALSE; } }