vincent Tue Jun 29 11:02:28 2004 EDT
Modified files:
/phpdoc/scripts notes_stats.php
Log:
Fixed sorting
Added info on what should be matched by the regex
http://cvs.php.net/diff.php/phpdoc/scripts/notes_stats.php?r1=1.2&r2=1.3&ty=u
Index: phpdoc/scripts/notes_stats.php
diff -u phpdoc/scripts/notes_stats.php:1.2 phpdoc/scripts/notes_stats.php:1.3
--- phpdoc/scripts/notes_stats.php:1.2 Mon Jun 28 09:43:32 2004
+++ phpdoc/scripts/notes_stats.php Tue Jun 29 11:02:28 2004
@@ -17,7 +17,7 @@
| Vincent Gevers <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: notes_stats.php,v 1.2 2004/06/28 13:43:32 vincent Exp $
+ $Id: notes_stats.php,v 1.3 2004/06/29 15:02:28 vincent Exp $
*/
/*
@@ -47,6 +47,9 @@
$first = 1;
$last = $new[0];
+//$first = 69000;
+//$last = 70000;
+
$time_start = getmicrotime();
$res = nntp_cmd($s,"XOVER $first-$last", 224)
@@ -60,8 +63,14 @@
$line = fgets($s, 4096);
list($n,$subj,$author,$odate,$messageid,$references,$bytes,$lines,$extra)=
explode("\t", $line, 9);
+/*
+ * What should be matched:
+ * note ID deleted from SECTION by EDITOR
+ * note ID rejected from SECTION by EDITOR
+ * note ID modified in SECTION by EDITOR
+ * note ID moved from SECTION to SECTION by EDITOR (not matched yet)
+ */
-//$reg = '/^note (\d*) (.*) from ([^ ]*) by ([a-z]*)/';
$reg = '/^note (\d*) (.*) (?:from|in) ([^ ]*) by ([a-z]*)/';
if (preg_match($reg, $subj, $d)) {
@@ -96,11 +105,13 @@
}
}
+
ksort($team);
-arsort($team['n']);
-arsort($team['o']);
arsort($files);
arsort($tmp);
+arsort($tmp['n']);
+arsort($tmp['o']);
+
echo '<html>
<head>
@@ -130,28 +141,26 @@
<?php
$bg = '#EBEBEB';
-
-foreach ($team as $user => $actions) {
+foreach ($tmp as $user => $total) {
if($user == 'o' or $user =='n')
continue;
-
- if($actions['total'] >= $minact) {
+
+ if($total >= $minact) {
echo "<tr bgcolor=\"";
$bg = ($bg == '#EBEBEB') ? '#BEBEBE' : '#EBEBEB';
echo "$bg\">\n\t<td>$user</td>\n\t<td>";
- echo isset($actions['deleted']) ? $actions['deleted'] : '0';
+ echo isset($team[$user]['deleted']) ? $team[$user]['deleted'] : '0';
echo "</td>\n\t<td>";
- echo isset($actions['rejected']) ? $actions['rejected'] : '0';
+ echo isset($team[$user]['rejected']) ? $team[$user]['rejected'] : '0';
echo "</td>\n\t<td>";
- echo isset($actions['modified']) ? $actions['modified'] : '0';
+ echo isset($team[$user]['modified']) ? $team[$user]['modified'] : '0';
echo "</td>\n\t<td>";
- echo $actions['total'];
+ echo $total;
echo "</td>\n</tr>\n";
}
}
-
?>
</table>
@@ -172,19 +181,19 @@
<?php
$bg = '#EBEBEB';
-foreach ($team['n'] as $user => $actions) {
+foreach ($tmp['n'] as $user => $total) {
- if($actions['total'] >= $minact) {
+ if($total >= $minact) {
echo "<tr bgcolor=\"";
$bg = ($bg == '#EBEBEB') ? '#BEBEBE' : '#EBEBEB';
echo "$bg\">\n\t<td>$user</td>\n\t<td>";
- echo isset($actions['deleted']) ? $actions['deleted'] : '0';
+ echo isset($team['n'][$user]['deleted']) ? $team['n'][$user]['deleted'] : '0';
echo "</td>\n\t<td>";
- echo isset($actions['rejected']) ? $actions['rejected'] : '0';
+ echo isset($team['n'][$user]['rejected']) ? $team['n'][$user]['rejected'] :
'0';
echo "</td>\n\t<td>";
- echo isset($actions['modified']) ? $actions['modified'] : '0';
+ echo isset($team['n'][$user]['modified']) ? $team['n'][$user]['modified'] :
'0';
echo "</td>\n\t<td>";
- echo $actions['total'];
+ echo $total;
echo "</td>\n</tr>\n";
}
@@ -211,19 +220,19 @@
<?php
$bg = '#EBEBEB';
-foreach ($team['o'] as $user => $actions) {
+foreach ($tmp['o'] as $user => $total) {
- if($actions['total'] >= $minact) {
+ if($total >= $minact) {
echo "<tr bgcolor=\"";
$bg = ($bg == '#EBEBEB') ? '#BEBEBE' : '#EBEBEB';
echo "$bg\">\n\t<td>$user</td>\n\t<td>";
- echo isset($actions['deleted']) ? $actions['deleted'] : '0';
+ echo isset($team['o'][$user]['deleted']) ? $team['o'][$user]['deleted'] : '0';
echo "</td>\n\t<td>";
- echo isset($actions['rejected']) ? $actions['rejected'] : '0';
+ echo isset($team['o'][$user]['rejected']) ? $team['o'][$user]['rejected'] :
'0';
echo "</td>\n\t<td>";
- echo isset($actions['modified']) ? $actions['modified'] : '0';
+ echo isset($team['o'][$user]['modified']) ? $team['o'][$user]['modified'] :
'0';
echo "</td>\n\t<td>";
- echo $actions['total'];
+ echo $total;
echo "</td>\n</tr>\n";
}
@@ -255,7 +264,7 @@
$bg = '#EBEBEB';
foreach ($team as $user => $actions) {
- if($user == 'o' or $user =='n')
+ if($user == 'o' or $user =='n' or $user == '')
continue;
echo "<tr bgcolor=\"";
