Name of binary blobs to be archived changed

pklaus · pklaus · commit 98bc79ff9369 · 2012-04-26T23:39:11.000+02:00
Attention! When updating to this version, you have to throw away the
archived tables in your Piwik database.
diff --git a/API.php b/API.php
@@ -31,9 +31,9 @@ public function getIntranetSubNetwork( $idSite, $period, $date, $segment = false
 	{
 		Piwik::checkUserHasViewAccess( $idSite );
 		$archive = Piwik_Archive::build($idSite, $period, $date, $segment );
-		$dataTable = $archive->getDataTable('IntranetSubNetwork_hostnameExt');
+		$dataTable = $archive->getDataTable('IntranetSubNetwork_networkNameExt');
 		$dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_VISITS));
-		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getHostSubnetName'));
+		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getSubnetName'));
 		$dataTable->queueFilter('ReplaceColumnNames');
 		//$dataTable->queueFilter('ReplaceSummaryRowLabel');
 		return $dataTable;
diff --git a/IntranetSubNetwork.php b/IntranetSubNetwork.php
@@ -68,7 +68,7 @@ function addWidget()
 	function archivePeriod( $notification )
 	{
 		$archiveProcessing = $notification->getNotificationObject();
-		$dataTableToSum = array( 'IntranetSubNetwork_hostnameExt' );
+		$dataTableToSum = array( 'IntranetSubNetwork_networkNameExt' );
 		$archiveProcessing->archiveDataTable($dataTableToSum);
 	}
 
@@ -79,7 +79,7 @@ function archiveDay($notification)
 	{
 		$archiveProcessing = $notification->getNotificationObject();
 		
-		$recordName = 'IntranetSubNetwork_hostnameExt';
+		$recordName = 'IntranetSubNetwork_networkNameExt';
 		$labelSQL = "location_IntranetSubNetwork";
 		$interestByIntranetSubNetwork = $archiveProcessing->getArrayInterestForLabel($labelSQL);
 		$tableIntranetSubNetwork = $archiveProcessing->getDataTableFromArray($interestByIntranetSubNetwork);
diff --git a/functions.php b/functions.php
@@ -8,7 +8,7 @@
  * @package Piwik_IntranetSubNetwork
  */
 
-function Piwik_getHostSubnetName($in)
+function Piwik_getSubnetName($in)
 {
 	if(empty($in))
 		return Piwik_Translate('General_Unknown');

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function addWidget()`
`68`	`68`	`function archivePeriod( $notification )`
`69`	`69`	`{`
`70`	`70`	`$archiveProcessing = $notification->getNotificationObject();`
`71`		`- $dataTableToSum = array( 'IntranetSubNetwork_hostnameExt' );`
	`71`	`+ $dataTableToSum = array( 'IntranetSubNetwork_networkNameExt' );`
`72`	`72`	`$archiveProcessing->archiveDataTable($dataTableToSum);`
`73`	`73`	`}`
`74`	`74`
`@@ -79,7 +79,7 @@ function archiveDay($notification)`
`79`	`79`	`{`
`80`	`80`	`$archiveProcessing = $notification->getNotificationObject();`
`81`	`81`
`82`		`- $recordName = 'IntranetSubNetwork_hostnameExt';`
	`82`	`+ $recordName = 'IntranetSubNetwork_networkNameExt';`
`83`	`83`	`$labelSQL = "location_IntranetSubNetwork";`
`84`	`84`	`$interestByIntranetSubNetwork = $archiveProcessing->getArrayInterestForLabel($labelSQL);`
`85`	`85`	`$tableIntranetSubNetwork = $archiveProcessing->getDataTableFromArray($interestByIntranetSubNetwork);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* @package Piwik_IntranetSubNetwork`
`9`	`9`	`*/`
`10`	`10`
`11`		`-function Piwik_getHostSubnetName($in)`
	`11`	`+function Piwik_getSubnetName($in)`
`12`	`12`	`{`
`13`	`13`	`if(empty($in))`
`14`	`14`	`return Piwik_Translate('General_Unknown');`