[zi-cvs] packages/com.zzoss.zic packages_dependencies.php,1.14,1.15
Sandro Zic <[email protected]> Tue, 13 Apr 2004 10:18:24 +0000
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23234/com.zzoss.zic
Modified Files:
packages_dependencies.php
Log Message:
- avoid duplicate 'needed by' packages
- show dep relation (ge, le, ...) if available
Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** packages_dependencies.php 7 Apr 2004 14:21:53 -0000 1.14
--- packages_dependencies.php 13 Apr 2004 10:18:16 -0000 1.15
***************
*** 185,188 ****
--- 185,197 ----
*/
if(is_array($pkgs_pending) && count($pkgs_pending)){
+
+ // translation table for dependency relations
+ $pkg_rels_transl = array(
+ 'ge' => 'greater or equal',
+ 'le' => 'lower or equal',
+ 'eq' => 'equal',
+ 'has ' => 'has'
+ );
+
/*
echo '<pre>';
***************
*** 213,275 ****
foreach($pkgs_pending as $pkg_name => $pkgs_needed_by){
if(!$zi_deps->hasUndefinedPackages()){
! $package = $packages[$pkg_name];
// temporarily assign package action
! $actions_deps[$package['id']] = 'I';
} else {
//print_r($pkgs_needed_by);
! $package['name'] = $pkgs_needed_by['name'];
! $package["release"]["version"] = $pkgs_needed_by['version'];
//$pkgs_needed_by = $pkgs_needed_by['needed_by'];
}
! $package_name_full = $package['name'];
! if(strlen($package_name_full) > 32){
! $package_name_short = substr($package_name_full, 0, 29).'...';
} else {
! $package_name_short = $package_name_full;
}
! ?>
! <tr>
! <td><?php
! if(!$zi_deps->hasUndefinedPackages()){
! ?>
! <a title="<?php echo $package_name_full.'-'.$package['release']['version']; ?>" href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', 'PackageInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank">
! <?php
! }
!
! echo $package_name_short;
!
! if(!$zi_deps->hasUndefinedPackages()){
! ?></a><br/><?php echo $package['summary'];
! }
! ?>
! </td>
! <td align="center"><?php
! echo $package["release"]["version"];
! if($package["release"]["version"]=="") {
! echo 'any';
! }
! if(!$zi_deps->hasUndefinedPackages()){
! echo ' <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/network.gif" align="absmiddle" border="0" alt="remote package" title="Download">';
! }
! ?></td>
! <td align="left"><?php
$pkgs_needed = $pkgs_needed_by['needed_by'];
! foreach($pkgs_needed as $pkg_needed){
! $package = $packages[key($pkg_needed)];
! $package_name_full = $package['name'];
! if(strlen($package_name_full) > 32){
! $package_name_short = substr($package_name_full, 0, 29).'...';
! } else {
! $package_name_short = $package_name_full;
! }
?>
! <a title="<?php echo $package_name_full.'-'.$package['release']['version']; ?>" href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', 'PackageInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank"><?php
! echo $package_name_short.'-'.$package['release']['version']; ?></a><br/><?php
}
- ?>
- </td>
- </tr>
- <?php
}
/*
--- 222,289 ----
foreach($pkgs_pending as $pkg_name => $pkgs_needed_by){
if(!$zi_deps->hasUndefinedPackages()){
! $package_needed = $packages[$pkg_name];
// temporarily assign package action
! $actions_deps[$package_needed['id']] = 'I';
} else {
//print_r($pkgs_needed_by);
! $package_needed['name'] = $pkgs_needed_by['name'];
! $package_needed["release"]["version"] = $pkgs_needed_by['version'];
//$pkgs_needed_by = $pkgs_needed_by['needed_by'];
}
! $package_needed_name_full = $package_needed['name'];
! if(strlen($package_needed_name_full) > 32){
! $package_needed_name_short = substr($package_needed_name_full, 0, 29).'...';
} else {
! $package_needed_name_short = $package_needed_name_full;
}
!
$pkgs_needed = $pkgs_needed_by['needed_by'];
! foreach($pkgs_needed as $pkg_needed => $pkg_rel){
?>
! <tr>
! <td><?php
! if(!$zi_deps->hasUndefinedPackages()){
! ?>
! <a title="<?php echo $package_needed_name_full.'-'.$package_needed['release']['version']; ?>" href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package_needed['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package_needed['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', 'PackageInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank">
! <?php
! }
!
! echo $package_needed_name_short;
!
! if(!$zi_deps->hasUndefinedPackages()){
! ?></a><br/><?php echo $package_needed['summary'];
! }
! ?>
! </td>
! <td align="center"><?php
! // show dependency relation if any
! if(isset($pkg_rels_transl[$pkg_rel])){
! echo $pkg_rels_transl[$pkg_rel].' ';
! }
!
! echo $package_needed["release"]["version"];
! if($package_needed["release"]["version"]=="") {
! echo 'any';
! }
! if(!$zi_deps->hasUndefinedPackages()){
! echo ' <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/network.gif" align="absmiddle" border="0" alt="remote package" title="Download">';
! }
! ?></td>
! <td align="left"><?php
! $package = $packages[$pkg_needed];
! $package_name_full = $package['name'];
! if(strlen($package_name_full) > 32){
! $package_name_short = substr($package_name_full, 0, 29).'...';
! } else {
! $package_name_short = $package_name_full;
! }
! ?>
! <a title="<?php echo $package_name_full.'-'.$package['release']['version']; ?>" href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=<?php echo $pkg_type; ?>&id=<?php echo $package['id']; ?>&application=<?php echo $_REQUEST['application']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', 'PackageInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank"><?php
! echo $package_name_short.'-'.$package['release']['version']; ?></a>
! </td>
! </tr>
! <?php
}
}
/*
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click