DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #2101 from dmeltzer/importer-again

Browse source 
Case insensitive string comparison for items when importing
This commit is contained in:
snipe 2016-06-01 18:13:02 -07:00
parent 04610e7864 da01591ab8
commit 1daa6abf48
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Console/Commands/ObjectImportCommand.php
View file

@ -248,7 +248,7 @@ class ObjectImportCommand extends Command {
foreach ($this->asset_models as $tempmodel) { foreach ($this->asset_models as $tempmodel) {
if ($tempmodel->name === $asset_model_name if ((strcasecmp($tempmodel->name, $asset_model_name) == 0)
&& $tempmodel->modelno == $asset_modelno && $tempmodel->modelno == $asset_modelno
&& $tempmodel->category_id == $category->id && $tempmodel->category_id == $category->id
&& $tempmodel->manufacturer_id == $manufacturer->id ) && $tempmodel->manufacturer_id == $manufacturer->id )
@ -295,7 +295,7 @@ class ObjectImportCommand extends Command {
$asset_category = 'Unnamed Category'; $asset_category = 'Unnamed Category';
foreach($this->categories as $tempcategory) { foreach($this->categories as $tempcategory) {
if( $tempcategory->name === $asset_category && $tempcategory->category_type === $item_type) { if( (strcasecmp($tempcategory->name, $asset_category) == 0) && $tempcategory->category_type === $item_type) {
$this->log('Category ' . $asset_category . ' already exists'); $this->log('Category ' . $asset_category . ' already exists');
return $tempcategory; return $tempcategory;
} }
@ -333,7 +333,7 @@ class ObjectImportCommand extends Command {
public function createOrFetchCompany($asset_company_name) public function createOrFetchCompany($asset_company_name)
{ {
foreach ($this->companies as $tempcompany) { foreach ($this->companies as $tempcompany) {
if ($tempcompany->name === $asset_company_name) { if (strcasecmp($tempcompany->name, $asset_company_name) == 0) {
$this->log('A matching Company ' . $asset_company_name . ' already exists'); $this->log('A matching Company ' . $asset_company_name . ' already exists');
return $tempcompany; return $tempcompany;
} }
@ -365,7 +365,7 @@ class ObjectImportCommand extends Command {
if(empty($asset_statuslabel_name)) if(empty($asset_statuslabel_name))
return; return;
foreach ($this->status_labels as $tempstatus) { foreach ($this->status_labels as $tempstatus) {
if ($tempstatus->name === $asset_statuslabel_name) { if (strcasecmp($tempstatus->name, $asset_statuslabel_name) == 0 ) {
$this->log('A matching Status ' . $asset_statuslabel_name . ' already exists'); $this->log('A matching Status ' . $asset_statuslabel_name . ' already exists');
return $tempstatus; return $tempstatus;
} }
@ -408,8 +408,8 @@ class ObjectImportCommand extends Command {
$this->log('Manufacturer ID: ' . $asset_mfgr); $this->log('Manufacturer ID: ' . $asset_mfgr);
foreach ($this->manufacturers as $tempmanufacturer) { foreach ($this->manufacturers as $tempmanufacturer) {
if ($tempmanufacturer->name === $asset_mfgr) { if (strcasecmp($tempmanufacturer->name, $asset_mfgr) == 0 ) {
$this->log('{Manufacturer [' . $asset_mfgr . ' already exists') . ']}'; $this->log('Manufacturer ' . $asset_mfgr . ' already exists') ;
return $tempmanufacturer; return $tempmanufacturer;
} }
} }
@ -448,7 +448,7 @@ class ObjectImportCommand extends Command {
public function createOrFetchLocation($asset_location) public function createOrFetchLocation($asset_location)
{ {
foreach($this->locations as $templocation) { foreach($this->locations as $templocation) {
if( $templocation->name === $asset_location ) { if( strcasecmp($templocation->name, $asset_location) == 0 ) {
$this->log('Location ' . $asset_location . ' already exists'); $this->log('Location ' . $asset_location . ' already exists');
return $templocation; return $templocation;
} }
@ -496,7 +496,7 @@ class ObjectImportCommand extends Command {
if(empty($supplier_name)) if(empty($supplier_name))
$supplier_name='Unknown'; $supplier_name='Unknown';
foreach ($this->suppliers as $tempsupplier) { foreach ($this->suppliers as $tempsupplier) {
if ($tempsupplier->name === $supplier_name) { if (strcasecmp($tempsupplier->name, $supplier_name) == 0) {
$this->log('A matching Company ' . $supplier_name . ' already exists'); $this->log('A matching Company ' . $supplier_name . ' already exists');
return $tempsupplier; return $tempsupplier;
} }
@ -618,7 +618,6 @@ class ObjectImportCommand extends Command {
*/ */
public function createAssetIfNotExists(array $row, array $item ) public function createAssetIfNotExists(array $row, array $item )
{ {
$asset_serial = $this->array_smart_fetch($row, "serial number"); $asset_serial = $this->array_smart_fetch($row, "serial number");
$asset_tag = $this->array_smart_fetch($row, "asset tag"); $asset_tag = $this->array_smart_fetch($row, "asset tag");
$asset_image = $this->array_smart_fetch($row, "image"); $asset_image = $this->array_smart_fetch($row, "image");
@ -637,7 +636,7 @@ class ObjectImportCommand extends Command {
$this->log('Notes: '.$item["notes"]); $this->log('Notes: '.$item["notes"]);
foreach ($this->assets as $tempasset) { foreach ($this->assets as $tempasset) {
if ($tempasset->asset_tag === $asset_tag ) { if (strcasecmp($tempasset->asset_tag, $asset_tag ) == 0 ) {
$this->log('A matching Asset ' . $asset_tag . ' already exists'); $this->log('A matching Asset ' . $asset_tag . ' already exists');
// $this->comment('A matching Asset ' . $asset_tag . ' already exists'); // $this->comment('A matching Asset ' . $asset_tag . ' already exists');
return; return;
@ -711,7 +710,7 @@ class ObjectImportCommand extends Command {
{ {
$this->log("Creating Accessory"); $this->log("Creating Accessory");
foreach ($this->accessories as $tempaccessory) { foreach ($this->accessories as $tempaccessory) {
if ($tempaccessory->name === $item["item_name"] ) { if (strcasecmp($tempaccessory->name, $item["item_name"] ) == 0 ) {
$this->log('A matching Accessory ' . $item["item_name"] . ' already exists. '); $this->log('A matching Accessory ' . $item["item_name"] . ' already exists. ');
// FUTURE: Adjust quantity on import maybe? // FUTURE: Adjust quantity on import maybe?
return; return;
@ -774,7 +773,7 @@ class ObjectImportCommand extends Command {
{ {
$this->log("Creating Consumable"); $this->log("Creating Consumable");
foreach($this->consumables as $tempconsumable) { foreach($this->consumables as $tempconsumable) {
if($tempconsumable->name === $item["item_name"]) { if(strcasecmp($tempconsumable->name, $item["item_name"]) == 0) {
$this->log("A matching consumable " . $item["item_name"] . " already exists"); $this->log("A matching consumable " . $item["item_name"] . " already exists");
//TODO: Adjust quantity if different maybe? //TODO: Adjust quantity if different maybe?
return; return;