Changeset 565 for trunk/web2/addons/job_monarch/libtoga.php
- Timestamp:
- 01/23/09 10:56:06 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/libtoga.php
r563 r565 1338 1338 if( $filtername!=null && $filtername!='' ) 1339 1339 { 1340 if( $filtername == 'jobid' && !$node->hasJob( $filtervalue))1340 if( $filtername == 'jobid' ) 1341 1341 { 1342 $addhost = 0; 1343 } 1344 if( $filtername == 'host' && $hostname != $filtervalue ) 1345 { 1346 $addhost = 0; 1347 } 1348 if( $filtername != 'jobid' && $filtername != 'host' ) 1349 { 1350 //if( $filtername == 'owner' ) 1351 //{ 1352 // printf( "%s ?= %s\n", $jobs[$myjob][$filtername], $filtervalue ); 1353 //} 1354 if( $jobs[$myjob][$filtername] == $filtervalue ) 1342 if ( $myjob != $filtervalue ) 1343 { 1344 $addhost = 0; 1345 break; 1346 } 1347 else 1355 1348 { 1356 1349 $addhost = 1; 1357 continue;1350 break; 1358 1351 } 1359 else if( $jobs[$myjob][$filtername] != $filtervalue ) 1352 } 1353 else 1354 { 1355 if( $filtername == 'host' && $hostname == $filtervalue ) 1360 1356 { 1361 1357 $addhost = 0; 1362 // printf( "vergeet host\n" );1363 1358 } 1364 } 1365 if( $filtername == 'query' ) 1366 { 1367 foreach( $jobs[$myjob] as $myj_attr => $myj_val ) 1359 else 1368 1360 { 1369 if( !is_array( $myj_val ))1361 if( $jobs[$myjob][$filtername] == $filtervalue ) 1370 1362 { 1371 if( strpos( $myj_val, $filtervalue ) !== false ) 1363 $addhost = 1; 1364 continue; 1365 } 1366 else if( $jobs[$myjob][$filtername] != $filtervalue ) 1367 { 1368 $addhost = 0; 1369 } 1370 } 1371 if( $filtername == 'query' ) 1372 { 1373 foreach( $jobs[$myjob] as $myj_attr => $myj_val ) 1374 { 1375 if(!is_array( $myj_val ) ) 1372 1376 { 1373 $addhost = 1; 1374 continue; 1375 } 1376 } 1377 else 1378 { 1379 foreach( $myj_val as $myj_v ) 1380 { 1381 if( strpos( $myj_v, $filtervalue ) !== false ) 1377 if( strpos( $myj_val, $filtervalue ) !== false ) 1382 1378 { 1383 1379 $addhost = 1; … … 1385 1381 } 1386 1382 } 1387 } 1388 if( strpos( $myjob, $filtervalue ) !== false ) 1389 { 1390 $addhost = 1; 1391 continue; 1383 else 1384 { 1385 foreach( $myj_val as $myj_v ) 1386 { 1387 if( strpos( $myj_v, $filtervalue ) !== false ) 1388 { 1389 $addhost = 1; 1390 continue; 1391 } 1392 } 1393 } 1394 if( strpos( $myjob, $filtervalue ) !== false ) 1395 { 1396 $addhost = 1; 1397 continue; 1398 } 1392 1399 } 1393 1400 }
Note: See TracChangeset
for help on using the changeset viewer.