MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.133'

pull/679/head
Iglocska 2015-09-24 10:37:51 +02:00
parent 043fd84161 4a75b1d2b5
commit 88fcf39194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":131}
{"major":2, "minor":3, "hotfix":133}

21
app/Console/Command/AdminShell.php
View File

@ -11,16 +11,19 @@ class AdminShell extends AppShell
$this->loadModel('Correlation');
$this->Correlation->deleteAll(array('id !=' => ''), false);
$this->loadModel('Attribute');
$fields = array('Attribute.id', 'Attribute.event_id', 'Attribute.distribution', 'Attribute.cluster', 'Event.date', 'Event.org');
// get all attributes..
$attributes = $this->Attribute->find('all', array('recursive' => -1));
// for all attributes..
$total = count($attributes);
foreach ($attributes as $k => $attribute) {
if ($k > 0 && $k % 1000 == 0) {
$this->Job->saveField('progress', $k/$total*100);
$attributeIDs = array_keys($this->Attribute->find('list'));
$total = count($attributeIDs);
$start = 0;
$continue = true;
while ($continue) {
$attributes = $this->Attribute->find('all', array('recursive' => -1, 'conditions' => array('AND' => array('Event.id' > $start, 'Event.id' <= ($start + 1000)))));
foreach ($attributes as $k => $attribute) {
$this->Attribute->__afterSaveCorrelation($attribute['Attribute']);
}
$this->Attribute->__afterSaveCorrelation($attribute['Attribute']);
$this->Job->saveField('progress', $k/$total*100);
$start += 1000;
if ($start > $total) $continue = false;
}
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done.');