removed google importer on the serverside, add importer for articles

2 files changed, 35 insertions, 1 deletions

diff --git a/db/feed.php b/db/feed.php
index caf0127d6..e84e4489d 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -78,6 +78,7 @@ class Feed extends Entity implements IAPI {
 		$url = trim($url);
 		if(strpos($url, 'http') === 0) {
 			parent::setLink($url);
+			$this->setUrlHash(md5($url));
 		}
 	}
 
diff --git a/db/item.php b/db/item.php
index c83da572d..5c0472eaf 100644
--- a/db/item.php
+++ b/db/item.php
@@ -40,7 +40,7 @@ class Item extends Entity implements IAPI {
 	public $enclosureMime;
 	public $enclosureLink;
 	public $feedId;
-	public $status;
+	public $status = 0;
 	public $lastModified;
 
 
@@ -126,6 +126,32 @@ class Item extends Entity implements IAPI {
 	}
 
 
+	public static function fromImport($import) {
+		$item = new static();
+		$item->setGuid($import['guid']);
+		$item->setUrl($import['url']);
+		$item->setTitle($import['title']);
+		$item->setAuthor($import['author']);
+		$item->setPubDate($import['pubDate']);
+		$item->setBody($import['body']);
+		$item->setEnclosureMime($import['enclosureMime']);
+		$item->setEnclosureLink($import['enclosureLink']);
+		if($import['unread']) {
+			$item->setUnread();
+		} else {
+			$item->setRead();
+		}
+		if($import['starred']) {
+			$item->setStarred();
+		} else {
+			$item->setUnstarred();
+		}
+		
+		$item->setFeedId(null);
+		return $item;
+	}
+
+
 	public function setAuthor($name) {
 		parent::setAuthor(strip_tags($name));
 	}
@@ -143,5 +169,12 @@ class Item extends Entity implements IAPI {
 		}
 	}
 
+
+	public function setGuid($guid) {
+		parent::setGuid($guid);
+		$this->setGuidHash(md5($guid));
+	}
+
+
 }