Fixed init data and cache dirs

CanonicalLink.php

@@ -5,7 +5,10 @@
 	of link shorteners, and iframe/frames based toolbar (e.g. Digg)
 **/
 class CanonicalLink {
-	var $config;
+	var $config = array(
+		'dataDir'  => 'canonical-link',
+		'dataFile' => 'links.ser'
+	);
 	var $cache;
 	var $http;
 
@@ -15,11 +18,14 @@ public function __construct($config=false) {
 		if ($config) {
 			$this->setConfig($config);
 		}
+		$this->_init();
 	}
 
 	public function setConfig($config) {
-		$this->config = $config;
-		$this->_init();
+		if (is_array($config)) {
+			$this->config = array_merge( $this->config, $config );
+		}
+		//$this->config = $config;
 	}
 
 	public function getCanonicalLink($url) {
@@ -68,7 +74,8 @@ protected function _getUrl($url) {
 	}	
 
 	protected function _init() {
-
+		$path = HttpUtilsConstants::initDataDir($this->config['dataDir']);
+		echo "Path: {$path}\n";
 	}
 }
 

HttpUtils.php

@@ -489,15 +489,36 @@ public function getBaseDataDir() {
 	}
 
 	public function initCacheDir($segment) {
-		$baseDir = self::getBaseDataDir();
-		return mkdir($cacheDir . $segment);
+		$baseDir = self::getBaseCacheDir();
+		$path    = $baseDir . $segment;
+		return self::initDir($path);		
 	}
 
 	public function initDataDir($segment) {
 		$baseDir = self::getBaseDataDir();
-		return mkdir($baseDir . $segment);
+		$path    = $baseDir . $segment;
+		return self::initDir($path);		
 	}
 
+	public function initDir($path) {
+		$exists  = file_exists($path);
+		$isDir   = false;
+
+		if (!$exists) {
+			$exists = mkdir($path);
+		}
+
+		if (!$exists) {
+			//exit("Can't create directory {$path}\n");
+			return NULL;
+		}
+
+		if ($exists && is_dir($path)) {
+			return $path . '/';
+		}
+		//exit("File already exists {$path}, and isn't a directory.\n");
+		return NULL;
+	}
 }
 
 ?>

tests/CanonicalLinkTest.php

@@ -14,6 +14,12 @@ public function setUp() {
 		$this->canon = new CanonicalLink();
 	}
 
+	public function testInit() {
+
+
+	}
+
+/****
 	public function testNormalUrl() {
 		$url = 'http://www.isolani.co.uk/';
 		$canonUrl = $this->canon->getCanonicalLink($url);
@@ -26,6 +32,7 @@ public function testTinyUrl() {
 		$canonUrl = $this->canon->getCanonicalLink($url);
 		$this->assertEquals($endUrl, $canonUrl);
 	}
+****/
 
 }