projects
/
gnucomo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41d8072
)
Optionally show or hide removed parameters from the parameter
author
arjen
<arjen>
Wed, 3 Dec 2003 08:03:28 +0000
(08:03 +0000)
committer
arjen
<arjen>
Wed, 3 Dec 2003 08:03:28 +0000
(08:03 +0000)
comparison page.
src/web/parameter.php
patch
|
blob
|
history
src/web/parameter_compare.php
patch
|
blob
|
history
diff --git
a/src/web/parameter.php
b/src/web/parameter.php
index
968a656
..
110a5fb
100644
(file)
--- a/
src/web/parameter.php
+++ b/
src/web/parameter.php
@@
-9,7
+9,7
@@
***********************
** FILE NAME : parameter.php
** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring
***********************
** FILE NAME : parameter.php
** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring
-** VERSION NUMBER : $Revision: 1.
6
$
+** VERSION NUMBER : $Revision: 1.
7
$
**
** DESCRIPTION :
**
**
** DESCRIPTION :
**
@@
-27,7
+27,11
@@
/*****************************
$Log: parameter.php,v $
/*****************************
$Log: parameter.php,v $
- Revision 1.6 2003-08-14 10:33:01 arjen
+ Revision 1.7 2003-12-03 08:03:28 arjen
+ Optionally show or hide removed parameters from the parameter
+ comparison page.
+
+ Revision 1.6 2003/08/14 10:33:01 arjen
Added performance measurement.
Revision 1.5 2003/07/15 11:06:45 arjen
Added performance measurement.
Revision 1.5 2003/07/15 11:06:45 arjen
@@
-44,7
+48,7
@@
******************************/
******************************/
-// RCSID = "$Id: parameter.php,v 1.
6 2003-08-14 10:33:01
arjen Exp $";
+// RCSID = "$Id: parameter.php,v 1.
7 2003-12-03 08:03:28
arjen Exp $";
ini_set('include_path', '.:./classes:../phpclasses');
ini_set('include_path', '.:./classes:../phpclasses');
@@
-98,6
+102,7
@@
class param_page extends page
<?php object_selection($this->database, $_GET['oid']); ?>
</select>
<input type='hidden' name='class' value='package'>
<?php object_selection($this->database, $_GET['oid']); ?>
</select>
<input type='hidden' name='class' value='package'>
+ <input type='checkbox' name='show_removed' value='on'>Show removed parameters
<input type='submit' value=' Show Difference'>
</form>
<?php
<input type='submit' value=' Show Difference'>
</form>
<?php
diff --git
a/src/web/parameter_compare.php
b/src/web/parameter_compare.php
index
a977b6f
..
db8d4c8
100644
(file)
--- a/
src/web/parameter_compare.php
+++ b/
src/web/parameter_compare.php
@@
-9,7
+9,7
@@
***********************
** FILE NAME : parameter_compare.php
** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring
***********************
** FILE NAME : parameter_compare.php
** SYSTEM NAME : Gnucomo - Gnu Computer Monitoring
-** VERSION NUMBER : $Revision: 1.
5
$
+** VERSION NUMBER : $Revision: 1.
6
$
**
** DESCRIPTION :
**
**
** DESCRIPTION :
**
@@
-21,13
+21,17
@@
********************************
** ORIGINAL AUTHOR : Arjen Baart - arjen@andromeda.nl
** CREATION DATE : Dec 04, 2002
********************************
** ORIGINAL AUTHOR : Arjen Baart - arjen@andromeda.nl
** CREATION DATE : Dec 04, 2002
-** LAST UPDATE :
Feb
03, 2003
+** LAST UPDATE :
Dec
03, 2003
** MODIFICATIONS :
**************************************************************************/
/*****************************
$Log: parameter_compare.php,v $
** MODIFICATIONS :
**************************************************************************/
/*****************************
$Log: parameter_compare.php,v $
- Revision 1.5 2003-08-14 10:31:57 arjen
+ Revision 1.6 2003-12-03 08:03:28 arjen
+ Optionally show or hide removed parameters from the parameter
+ comparison page.
+
+ Revision 1.5 2003/08/14 10:31:57 arjen
BUGFIX: Removed parameters were somtimes shown on the wrong side
of the parameter difference page.
BUGFIX: Removed parameters were somtimes shown on the wrong side
of the parameter difference page.
@@
-42,7
+46,7
@@
******************************/
******************************/
-// RCSID = "$Id: parameter_compare.php,v 1.
5 2003-08-14 10:31:57
arjen Exp $";
+// RCSID = "$Id: parameter_compare.php,v 1.
6 2003-12-03 08:03:28
arjen Exp $";
ini_set('include_path', '.:./classes:../phpclasses');
ini_set('include_path', '.:./classes:../phpclasses');
@@
-150,14
+154,35
@@
class param_diff extends page
echo "<tr><th colspan='2'>" . $obj->objectname . "</th>";
echo "<th colspan='2'>" . $cmp_obj->objectname . "</th></tr>\n";
echo "<tr><th>Name</th><th>Properties</th><th>Name</th><th>Propterties</th></tr>\n";
echo "<tr><th colspan='2'>" . $obj->objectname . "</th>";
echo "<th colspan='2'>" . $cmp_obj->objectname . "</th></tr>\n";
echo "<tr><th>Name</th><th>Properties</th><th>Name</th><th>Propterties</th></tr>\n";
+
+ $hide_removed = true;
+ $hide_removed = $_POST['show_removed'] != 'on';
+
$row = 0;
while ($row < pg_numrows($res))
{
$row = 0;
while ($row < pg_numrows($res))
{
- $par = pg_fetch_object($res, $row);
- $nextpar = 'false';
- if ($row + 1 < pg_numrows($res))
+ // Find the next two parameters, optionally skipping removed parameters.
+
+ $par = false;
+ while (!$par && $row < pg_numrows($res))
+ {
+ $par = pg_fetch_object($res, $row);
+ if ($hide_removed && $this->is_removed($par->paramid))
+ {
+ $par = false;
+ $row++;
+ }
+ }
+ $nextpar = false;
+ $nextrow = $row + 1;
+ while (!$nextpar && $nextrow < pg_numrows($res))
{
{
- $nextpar = pg_fetch_object($res, $row + 1);
+ $nextpar = pg_fetch_object($res, $nextrow);
+ if ($hide_removed && $this->is_removed($nextpar->paramid))
+ {
+ $nextpar = false;
+ $nextrow++;
+ }
}
echo "<tr>";
}
echo "<tr>";