Line 844... |
Line 844... |
844 |
foreach ( array_keys( $softwareHash ) as $key ) {
|
844 |
foreach ( array_keys( $softwareHash ) as $key ) {
|
845 |
if ( ! isset( $softwareHash[$key]['name'] ) )
|
845 |
if ( ! isset( $softwareHash[$key]['name'] ) )
|
846 |
$softwareHash[$key]['name'] = $key;
|
846 |
$softwareHash[$key]['name'] = $key;
|
847 |
if ( ! isset( $softwareHash[$key]['description'] ) )
|
847 |
if ( ! isset( $softwareHash[$key]['description'] ) )
|
848 |
$softwareHash[$key]['description'] = '';
|
848 |
$softwareHash[$key]['description'] = '';
|
- |
|
849 |
if ( isset( $softwareHash[$key]['release'] ) ) // some of them have a release number, so we just add that to the version
|
- |
|
850 |
$softwareHash[$key]['version'] = $softwareHash[$key]['version'] . '-r' . $softwareHash[$key]['release'];
|
849 |
// This is needed for matching
|
851 |
// This is needed for matching
|
850 |
$softwareHash[$key]['keyfield'] = $softwareHash[$key]['name'] . $softwareHash[$key]['version'];
|
852 |
$softwareHash[$key]['keyfield'] = $softwareHash[$key]['name'] . $softwareHash[$key]['version'];
|
851 |
} // foreach
|
853 |
} // foreach
|
852 |
// at this point, we should have a slot and a name field in all pci devices
|
854 |
// at this point, we should have a slot and a name field in all pci devices
|
853 |
$toAdd = $this->AddDeleteUpdate( $softwareHash, $queries, 'Software Packages' );
|
855 |
$toAdd = $this->AddDeleteUpdate( $softwareHash, $queries, 'Software Packages' );
|