[Piwik-svn] r323 - trunk/modules

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-04 18:50:06 +0100 (Tue, 04 Mar 2008)
New Revision: 323

Modified:
   trunk/modules/ArchiveProcessing.php
Log:
- Trying to workaround php 5.1.6 bug with toString not being called in all cases.

Modified: trunk/modules/ArchiveProcessing.php
===================================================================
--- trunk/modules/ArchiveProcessing.php	2008-02-29 22:34:31 UTC (rev 322)
+++ trunk/modules/ArchiveProcessing.php	2008-03-04 17:50:06 UTC (rev 323)
@@ -178,7 +178,7 @@
 	 */
 	public function getTableArchiveNumericName()
 	{
-		return (string)$this->tableArchiveNumeric;
+		return $this->tableArchiveNumeric->getTableName();
 	}
 	
 	/**
@@ -188,7 +188,7 @@
 	 */
 	public function getTableArchiveBlobName()
 	{
-		return (string)$this->tableArchiveBlob;
+		return $this->tableArchiveBlob->getTableName();
 	}
 	
 	
@@ -292,7 +292,7 @@
 		
 		// delete the first done = ERROR 
 		Zend_Registry::get('db')->query("
-							DELETE FROM ".$this->tableArchiveNumeric." 
+							DELETE FROM ".$this->tableArchiveNumeric->getTableName()." 
 							WHERE idarchive = ? AND name = 'done'",
 					array($this->idArchive)
 				);
@@ -327,7 +327,7 @@
 	protected function loadNextIdarchive()
 	{
 		$db = Zend_Registry::get('db');
-		$id = $db->fetchOne("SELECT max(idarchive) FROM ".$this->tableArchiveNumeric);
+		$id = $db->fetchOne("SELECT max(idarchive) FROM ".$this->tableArchiveNumeric->getTableName());
 		if(empty($id))
 		{
 			$id = 0;
@@ -353,7 +353,7 @@
 			$table = $this->tableArchiveBlob;
 		}
 		
-		$query = "INSERT INTO ".$table." (idarchive, idsite, date1, date2, period, ts_archived, name, value)
+		$query = "INSERT INTO ".$table->getTableName()." (idarchive, idsite, date1, date2, period, ts_archived, name, value)
 					VALUES (?,?,?,?,?,?,?,?)";
 		Zend_Registry::get('db')->query($query, 
 							array(	$this->idArchive,
@@ -416,7 +416,7 @@
 		$bindSQL[] = $this->maxTimestampArchive;
 			
 		$sqlQuery = "	SELECT idarchive, value, name, UNIX_TIMESTAMP(date1) as timestamp
-						FROM ".$this->tableArchiveNumeric."
+						FROM ".$this->tableArchiveNumeric->getTableName()."
 						WHERE idsite = ?
 							AND date1 = ?
 							AND date2 = ?