Skip to content
Extraits de code Groupes Projets
Valider d5529e73 rédigé par BeezyT's avatar BeezyT
Parcourir les fichiers

Refs #2662 Actions.get* for date range 

git-svn-id: http://dev.piwik.org/svn/trunk@5172 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 68f276a4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 184 ajouts et 65 suppressions
core/DataTable.php
+ 19
− 0
Voir le fichier @ d5529e73
...@@ -450,6 +450,25 @@ class Piwik_DataTable ...@@ -450,6 +450,25 @@ class Piwik_DataTable
return $this->rows[$this->rowsIndexByLabel[$label]]; return $this->rows[$this->rowsIndexByLabel[$label]];
} }
/**
* Returns a Piwik_DataTable that has only the one column that matches $label.
* If no matches are found, an empty data table is returned.
*
* @param string $label Value of the column 'label' to search for
* @return Piwik_DataTable
*/
public function getFilteredTableFromLabel($label)
{
$newTable = new Piwik_DataTable;
$row = $this->getRowFromLabel($label);
if ($row !== false)
{
$newTable->addRow($row);
$newTable->queuedFilters = $this->queuedFilters;
}
return $newTable;
}
/** /**
* Rebuilds the index used to lookup a row by label * Rebuilds the index used to lookup a row by label
*/ */
......
core/DataTable/Array.php
+ 22
− 0
Voir le fichier @ d5529e73
...@@ -176,4 +176,26 @@ class Piwik_DataTable_Array ...@@ -176,4 +176,26 @@ class Piwik_DataTable_Array
$table->deleteColumns($columns); $table->deleteColumns($columns);
} }
} }
/**
* Returns a Piwik_DataTable_Array whose sub tables are filtered by $label
* @see Piwik_DataTable::getFilteredTableFromLabel
*
* @param string $label Value of the column 'label' to search for
* @return Piwik_DataTable_Array
*/
public function getFilteredTableFromLabel($label)
{
$newTableArray = new Piwik_DataTable_Array;
$newTableArray->metadata = $this->metadata;
foreach ($this->array as $subTableLabel => $subTable)
{
$subTable = $subTable->getFilteredTableFromLabel($label);
$newTableArray->addTable($subTable, $subTableLabel);
}
return $newTableArray;
}
} }
plugins/Actions/API.php
+ 71
− 41
Voir le fichier @ d5529e73
...@@ -116,69 +116,99 @@ class Piwik_Actions_API ...@@ -116,69 +116,99 @@ class Piwik_Actions_API
* Will search in the DataTable for a Label matching the searched string * Will search in the DataTable for a Label matching the searched string
* and return only the matching row, or an empty datatable * and return only the matching row, or an empty datatable
*/ */
protected function getFilterPageDatatableSearch( $callBackParameters, $search, $actionType, $table = false, $searchTree = false, $searchCurrentLevel = 0 ) protected function getFilterPageDatatableSearch($callBackParameters, $search, $actionType, $table = false,
$searchTree = false)
{ {
if($table === false) if ($searchTree === false)
{
$table = call_user_func_array(array('Piwik_Archive', 'getDataTableFromArchive'), $callBackParameters);
}
if($searchTree === false)
{ {
// build the query parts that are searched inside the tree
if($actionType == Piwik_Tracker_Action::TYPE_ACTION_NAME) if($actionType == Piwik_Tracker_Action::TYPE_ACTION_NAME)
{ {
$searchedString = Piwik_Common::unsanitizeInputValue($search); $searchedString = Piwik_Common::unsanitizeInputValue($search);
} }
else else
{ {
$searchedString = Piwik_Tracker_Action::excludeQueryParametersFromUrl($search, $idSite = $callBackParameters[1]); $idSite = $callBackParameters[1];
$searchedString = Piwik_Tracker_Action::excludeQueryParametersFromUrl($search, $idSite);
} }
$searchTree = Piwik_Actions::getActionExplodedNames($searchedString, $actionType); $searchTree = Piwik_Actions::getActionExplodedNames($searchedString, $actionType);
} }
if(!($table instanceof Piwik_DataTable))
{ if ($table === false)
throw new Exception("For this API function, date=lastN or date=previousM is not supported");
}
$rows = $table->getRows();
$labelSearch = $searchTree[$searchCurrentLevel];
$isEndSearch = ((count($searchTree)-1) == $searchCurrentLevel);
foreach($rows as $key => $row)
{ {
$found = false; // fetch the data table
// Found a match at this level $table = call_user_func_array(array('Piwik_Archive', 'getDataTableFromArchive'), $callBackParameters);
$label = $row->getColumn('label');
if($label === $labelSearch) if ($table instanceof Piwik_DataTable_Array)
{ {
// Is this the end of the search tree? then we found the requested row // search an array of tables, e.g. when using date=last30
if($isEndSearch) // note that if the root is an array, we filter all children
{ // if an array occurs inside the nested table, we only look for the first match (see below)
// var_dump($label); var_dump($labelSearch); exit; $newTableArray = new Piwik_DataTable_Array;
$table = new Piwik_DataTable(); $newTableArray->metadata = $table->metadata;
$table->addRow($row);
return $table;
}
// If we still need to search deeper, call search foreach ($table->getArray() as $label => $subTable)
$idSubTable = $row->getIdSubDataTable();
// Update the idSubtable in the callback parameter list, to fetch this subtable from the archive
$callBackParameters[6] = $idSubTable;
$subTable = call_user_func_array(array('Piwik_Archive', 'getDataTableFromArchive'), $callBackParameters);
$found = $this->getFilterPageDatatableSearch($callBackParameters, $search, $actionType, $subTable, $searchTree, $searchCurrentLevel+1);
if($found)
{ {
return $found; $subTable = $this->doFilterPageDatatableSearch($callBackParameters, $subTable, $searchTree);
$newTableArray->addTable($subTable, $label);
} }
return $newTableArray;
} }
if(!$found)
}
return $this->doFilterPageDatatableSearch($callBackParameters, $table, $searchTree);
}
protected function doFilterPageDatatableSearch($callBackParameters, $table, $searchTree)
{
// filter a data table array
if ($table instanceof Piwik_DataTable_Array)
{
foreach ($table->getArray() as $subTable)
{ {
$table->deleteRow($key); $filteredSubTable = $this->doFilterPageDatatableSearch($callBackParameters, $subTable, $searchTree);
if ($filteredSubTable->getRowsCount() > 0)
{
// match found in a sub table, return and stop searching the others
return $filteredSubTable;
}
} }
// nothing found in all sub tables
return new Piwik_DataTable;
} }
// Case the DataTable was searched but nothing was found, @see getFilterPageDatatableSearch()
if($searchCurrentLevel == 0) // filter regular data table
if ($table instanceof Piwik_DataTable)
{ {
return new Piwik_DataTable; // search for the first part of the tree search
$search = array_shift($searchTree);
$row = $table->getRowFromLabel($search);
if ($row === false)
{
// not found
return new Piwik_DataTable;
}
// end of tree search reached
if (count($searchTree) == 0)
{
$table = new Piwik_DataTable();
$table->addRow($row);
return $table;
}
// match found on this level and more levels remaining: go deeper
$idSubTable = $row->getIdSubDataTable();
$callBackParameters[6] = $idSubTable;
$table = call_user_func_array(array('Piwik_Archive', 'getDataTableFromArchive'), $callBackParameters);
return $this->doFilterPageDatatableSearch($callBackParameters, $table, $searchTree);
} }
return false;
throw new Exception("For this API function, DataTable ".get_class($table)." is not supported");
} }
/** /**
......
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2009-01-04" />
</result> <result defaultKeyName="2009-01-05" />
\ No newline at end of file <result defaultKeyName="2009-01-06" />
<result defaultKeyName="2009-01-07" />
<result defaultKeyName="2009-01-08" />
<result defaultKeyName="2009-01-09" />
<result defaultKeyName="2009-01-10" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2008-12-29 to 2009-01-04" />
</result> <result defaultKeyName="2009-01-05 to 2009-01-11" />
\ No newline at end of file <result defaultKeyName="2009-01-12 to 2009-01-18" />
<result defaultKeyName="2009-01-19 to 2009-01-25" />
<result defaultKeyName="2009-01-26 to 2009-02-01" />
<result defaultKeyName="2009-02-02 to 2009-02-08" />
<result defaultKeyName="2009-02-09 to 2009-02-15" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2009-01-04" />
</result> <result defaultKeyName="2009-01-05" />
\ No newline at end of file <result defaultKeyName="2009-01-06" />
<result defaultKeyName="2009-01-07" />
<result defaultKeyName="2009-01-08" />
<result defaultKeyName="2009-01-09" />
<result defaultKeyName="2009-01-10" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2008-12-29 to 2009-01-04" />
</result> <result defaultKeyName="2009-01-05 to 2009-01-11" />
\ No newline at end of file <result defaultKeyName="2009-01-12 to 2009-01-18" />
<result defaultKeyName="2009-01-19 to 2009-01-25" />
<result defaultKeyName="2009-01-26 to 2009-02-01" />
<result defaultKeyName="2009-02-02 to 2009-02-08" />
<result defaultKeyName="2009-02-09 to 2009-02-15" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2009-01-04" />
</result> <result defaultKeyName="2009-01-05" />
\ No newline at end of file <result defaultKeyName="2009-01-06" />
<result defaultKeyName="2009-01-07" />
<result defaultKeyName="2009-01-08" />
<result defaultKeyName="2009-01-09" />
<result defaultKeyName="2009-01-10" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2008-12-29 to 2009-01-04" />
</result> <result defaultKeyName="2009-01-05 to 2009-01-11" />
\ No newline at end of file <result defaultKeyName="2009-01-12 to 2009-01-18" />
<result defaultKeyName="2009-01-19 to 2009-01-25" />
<result defaultKeyName="2009-01-26 to 2009-02-01" />
<result defaultKeyName="2009-02-02 to 2009-02-08" />
<result defaultKeyName="2009-02-09 to 2009-02-15" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2009-01-04" />
</result> <result defaultKeyName="2009-01-05" />
\ No newline at end of file <result defaultKeyName="2009-01-06" />
<result defaultKeyName="2009-01-07" />
<result defaultKeyName="2009-01-08" />
<result defaultKeyName="2009-01-09" />
<result defaultKeyName="2009-01-10" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
+ 9
− 3
Voir le fichier @ d5529e73
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <results>
<error message="For this API function, date=lastN or date=previousM is not supported" /> <result defaultKeyName="2008-12-29 to 2009-01-04" />
</result> <result defaultKeyName="2009-01-05 to 2009-01-11" />
\ No newline at end of file <result defaultKeyName="2009-01-12 to 2009-01-18" />
<result defaultKeyName="2009-01-19 to 2009-01-25" />
<result defaultKeyName="2009-01-26 to 2009-02-01" />
<result defaultKeyName="2009-02-02 to 2009-02-08" />
<result defaultKeyName="2009-02-09 to 2009-02-15" />
</results>
\ No newline at end of file
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter