--- C:/Documents and Settings/witold.grabowski/Moje dokumenty/drupal/dev/aggregation.module.org	Mon Apr 02 11:06:28 2007
+++ C:/Documents and Settings/witold.grabowski/Moje dokumenty/drupal/dev/aggregation.module	Mon Apr 02 11:10:52 2007
@@ -805,28 +805,28 @@
  */
 
 function aggregation_item_insert($node)
 {
 	db_query("INSERT INTO {aggregation_item} (nid, url, link_to_original_url, original_author, ".
-		"story_guid, fid, image_id, image_guid) VALUES (%d, '%s', '%s', '%s', %d, %d, ".
-		"%d, %d)", $node->nid, $node->url, $node->link_to_original_url, $node->original_author, $node->story_guid, $node->fid, $node->image_id, $node->image_guid ? $node->image_guid : 0);
+		"story_guid, fid, image_id, image_guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, ".
+		"%d, '%s')", $node->nid, $node->url, $node->link_to_original_url, $node->original_author, $node->story_guid, $node->fid, $node->image_id, $node->image_guid ? $node->image_guid : 0);
 }
 
 /**
  * Implementation of hook_update().
  */
 
 function aggregation_item_update($node)
 {
 	if ($node->story_guid === '')
 		db_query("UPDATE {aggregation_item} SET url = '%s', original_author = '%s', ".
-			"fid = %d, image_id = %d, image_guid = %d, link_to_original_url = '%s' ".
+			"fid = %d, image_id = %d, image_guid = '%s', link_to_original_url = '%s' ".
 			"WHERE nid = %d", $node->url, $node->original_author, $node->fid, $node->image_id, 
 			$node->image_guid ? $node->image_guid : 0, $node->link_to_original_url, $node->nid);	
 	else	
 		db_query("UPDATE {aggregation_item} SET url = '%s', original_author = '%s', ".
-			"story_guid = %d, fid = %d, image_id = %d, image_guid = %d, link_to_original_url = '%s' ".
+			"story_guid = '%s', fid = %d, image_id = %d, image_guid = '%s', link_to_original_url = '%s' ".
 			"WHERE nid = %d", $node->url, $node->original_author, $node->story_guid, $node->fid, 
 			$node->image_id, $node->image_guid ? $node->image_guid : 0, $node->link_to_original_url, $node->nid);
 }
 
 /**
@@ -1200,20 +1200,21 @@
 		}
 	}
 		
 	// check item exists by checking GUID
 	$guid = sprintf('%u', crc32($guid));
+	watchdog('aggregation', "guid \"$guid\" for feed $title", WATCHDOG_NOTICE, l(t('view'), "node/$item_object->nid"));
 	if (!$interval_check)	
 	{
 		if (db_fetch_object(db_query("SELECT COUNT(nid) AS node_count FROM {aggregation_item} ".
-			"WHERE story_guid = %d AND fid = %d", $guid, $feed->nid))->node_count > 0)
+			"WHERE story_guid = '%s' AND fid = %d", $guid, $feed->nid))->node_count > 0)
 			return;
 	}
 	else // since no real guid is available (neither unique guid nor url nor image_url), we resort to checking the title or body
 	{
 		if (db_fetch_object(db_query("SELECT COUNT(n.nid) AS node_count FROM {node} n, {aggregation_item} ai ".
-			"WHERE ai.nid = n.nid AND ai.story_guid = %d AND UNIX_TIMESTAMP() - n.created ".
+			"WHERE ai.nid = n.nid AND ai.story_guid = '%s' AND UNIX_TIMESTAMP() - n.created ".
 			($feed->title_as_guid_interval == 0 ? ">=" : "<=")." %d", 
 			$guid, $feed->title_as_guid_interval * 60 * 60))->node_count > 0)
 			return;
 	}
 	
@@ -1310,11 +1311,11 @@
 	$image_array['url'] = ereg_replace(" ", "%20", $image_array['url']);
 	
 	$numeric_guid = sprintf('%u', crc32($image_array['guid']));
 	
 	$image_exists = 
-		db_query("SELECT ai.image_id FROM {aggregation_item} ai WHERE ai.image_guid = %d", $numeric_guid);
+		db_query("SELECT ai.image_id FROM {aggregation_item} ai WHERE ai.image_guid = '%s'", $numeric_guid);
 	if (db_num_rows($image_exists) > 0) return array(db_fetch_object($image_exists)->image_id, $numeric_guid);
 				
 	$filename = substr($image_array['url'], strrpos($image_array['url'], '/') + 1);
 
 	$newfile = file_directory_path().'/'._image_filename($filename, NULL, TRUE);