| Line 134... |
Line 134... |
| 134 |
long entityId = item.getCatalogItemId();
|
134 |
long entityId = item.getCatalogItemId();
|
| 135 |
Entity entity = entities.get(entityId);
|
135 |
Entity entity = entities.get(entityId);
|
| 136 |
if(entity==null){
|
136 |
if(entity==null){
|
| 137 |
continue;
|
137 |
continue;
|
| 138 |
}
|
138 |
}
|
| 139 |
String itemBrand = item.getBrand();
|
139 |
String itemBrand = item.getBrand().trim();
|
| 140 |
String itemModelName = item.getModelName();
|
140 |
String itemModelName = item.getModelName();
|
| - |
|
141 |
if(itemModelName!=null){
|
| - |
|
142 |
itemModelName = itemModelName.trim();
|
| - |
|
143 |
}
|
| 141 |
String itemModelNumber = item.getModelNumber();
|
144 |
String itemModelNumber = item.getModelNumber().trim();
|
| 142 |
String entityBrand = entity.getBrand();
|
145 |
String entityBrand = entity.getBrand().trim();
|
| 143 |
String entityModelName = entity.getModelName();
|
146 |
String entityModelName = entity.getModelName().trim();
|
| - |
|
147 |
if(entityModelName!=null){
|
| - |
|
148 |
entityModelName = entityModelName.trim();
|
| - |
|
149 |
}
|
| 144 |
String entityModelNumber = entity.getModelNumber();
|
150 |
String entityModelNumber = entity.getModelNumber().trim();
|
| 145 |
|
151 |
|
| 146 |
if(itemBrand.equals(entityBrand) && itemModelNumber.equals(entityModelNumber)){
|
152 |
if(itemBrand.equals(entityBrand) && itemModelNumber.equals(entityModelNumber)){
|
| 147 |
if(itemModelName!=null && entityModelName !=null && itemModelName.equals(entityModelName)){
|
153 |
if(itemModelName!=null && entityModelName !=null && itemModelName.equals(entityModelName)){
|
| 148 |
continue;
|
154 |
continue;
|
| 149 |
}else if(itemModelName==null && entityModelName ==null){
|
155 |
}else if(itemModelName==null && entityModelName ==null){
|
| Line 154... |
Line 160... |
| 154 |
count++;
|
160 |
count++;
|
| 155 |
sb.append(count + ") Item: " + itemBrand + "\t" + itemModelName + "\t" + itemModelNumber+ "\t"+ item.getId() + "\n");
|
161 |
sb.append(count + ") Item: " + itemBrand + "\t" + itemModelName + "\t" + itemModelNumber+ "\t"+ item.getId() + "\n");
|
| 156 |
sb.append(count + ") Entity: " + entityBrand + "\t" + entityModelName + "\t" + entityModelNumber+ "\t" + entity.getID() + "\n");
|
162 |
sb.append(count + ") Entity: " + entityBrand + "\t" + entityModelName + "\t" + entityModelNumber+ "\t" + entity.getID() + "\n");
|
| 157 |
|
163 |
|
| 158 |
if(dryRun.equals("false")){
|
164 |
if(dryRun.equals("false")){
|
| 159 |
item.setBrand(entity.getBrand());
|
165 |
item.setBrand(entityBrand);
|
| 160 |
item.setModelName(entity.getModelName());
|
166 |
item.setModelName(entityModelName);
|
| 161 |
item.setModelNumber(entity.getModelNumber());
|
167 |
item.setModelNumber(entityModelNumber);
|
| 162 |
client.updateItem(item);
|
168 |
client.updateItem(item);
|
| 163 |
}
|
169 |
}
|
| 164 |
}
|
170 |
}
|
| 165 |
System.out.println(sb.toString());
|
171 |
System.out.println(sb.toString());
|
| 166 |
return true;
|
172 |
return true;
|