Skip to content

Commit

Permalink
Removed more error_log() debug statements
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Mussulis committed Sep 8, 2023
1 parent 827d2c8 commit 8056e44
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
2 changes: 0 additions & 2 deletions magmi/inc/fshelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ public function unlink($path)
*/
public function copyFromRemote($remoteurl, $destpath)
{
error_log("copyFromRemote()" . __LINE__);
$rfg = RemoteFileGetterFactory::getFGInstance($this->_rfgid);
$mp = str_replace("//", "/", $this->_magdir . "/" . str_replace($this->_magdir, '', $destpath));
$ok = $rfg->copyRemoteFile($remoteurl, $mp);
Expand All @@ -388,7 +387,6 @@ public function copyFromRemote($remoteurl, $destpath)
*/
public function copy($srcpath, $destpath)
{
error_log("copy() " . __LINE__);
$result = false;
$destpath = str_replace("//", "/", $this->_magdir . "/" . str_replace($this->_magdir, '', $destpath));
if (preg_match('|^.*?://.*$|', $srcpath)) {
Expand Down
1 change: 0 additions & 1 deletion magmi/plugins/5b5/general/attributesetimport/name2id_decoding.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public function decode($record)
$indexedResult[] = $mappingTable[$values];
} else {
$indexedResult[] = $record[$columnName];
error_log("Mapped value not found for column $columnName for name(s): ".print_r($values, true));
}
}
}
Expand Down
22 changes: 1 addition & 21 deletions magmi/plugins/extra/itemprocessors/imageprocessor/imageitattributeemprocessor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public function initialize($params)
$this->magdir = Magmi_Config::getInstance()->getMagentoDir();
$this->_mdh = MagentoDirHandlerFactory::getInstance()->getHandler($this->magdir);
$this->_mdh->setRemoteGetterId("image");
error_log("mdh: " . get_class($this->_mdh));

// remote root
if ($this->getParam("IMG:remoteroot", "")) {
Expand Down Expand Up @@ -440,15 +439,12 @@ public function saveImage($imgfile, $target)
*/
public function copyImageFile($imgfile, &$item, $extra)
{
error_log("in copyImageFile");
if ($imgfile == "__NULL__" || $imgfile == null) {
error_log("$imgfile is null");
return false;
}

// check for source image in error
if ($this->isErrorImage($imgfile)) {
error_log("Error $imgfile");
if ($this->_newitem) {
$this->fillErrorAttributes($item);
};
Expand All @@ -457,14 +453,12 @@ public function copyImageFile($imgfile, &$item, $extra)

//handle remote root per image
if (!is_remote_path($imgfile)) {
error_log("! is_remote_path $imgfile");
if ($this->_remoteroot != "") {
$imgfile = $this->_remoteroot . str_replace("//", "/", "/$imgfile");
}
}
//handle amazon specific
if (is_remote_path($imgfile)) {
error_log("is_remote_path $imgfile");
// Amazon images patch , remove SLXXXX part
if (preg_match('|amazon\..*?/images/I|', $imgfile)) {
$pattern = '/\bSL[0-9]+\./i';
Expand All @@ -474,7 +468,6 @@ public function copyImageFile($imgfile, &$item, $extra)

$source = $this->findImageFile($imgfile);
if ($source == false) {
error_log("$imgfile not found");
$this->log("$imgfile cannot be found in images path", "warning");
// last image in error,add it to error cache
$this->setErrorImg($imgfile);
Expand All @@ -491,36 +484,27 @@ public function copyImageFile($imgfile, &$item, $extra)
$impath = "/$i1/$i2/$bimgfile";
// target directory;

error_log("current cwd: " . getcwd());
if(!strstr(getcwd(), "pub"))
$l2d = "pub/media/catalog/product/$i1/$i2";
else
$l2d = "media/catalog/product/$i1/$i2";
// test for existence
$targetpath = "$l2d/$bimgfile";
error_log("l2d " . $l2d);
error_log("targetpath " . $targetpath);

/* test for same image (without problem) */
if ($impath == $this->_lastimage) {
return $impath;
}

error_log("mdh->file_exists() " . $this->_mdh->file_exists($targetpath));
error_log("writemode " . $this->getParam("IMG:writemode"));


/* test if imagefile comes from export */
if (!$this->_mdh->file_exists($targetpath) || $this->getParam("IMG:writemode") == "override") {
error_log("file not exists || writemode is override");
// if we already had problems with this target,assume we'll get others.
if ($this->isErrorImage($impath)) {
error_log("isError");
return false;
}

/* try to recursively create target dir */
if (!$this->_mdh->file_exists($l2d)) {
error_log("creating target dir");
$tst = $this->_mdh->mkdir($l2d, Magmi_Config::getInstance()->getDirMask(), true);
if (!$tst) {
// if we had problem creating target directory,add target to error cache
Expand All @@ -533,19 +517,16 @@ public function copyImageFile($imgfile, &$item, $extra)
}

if (!$this->saveImage($imgfile, $targetpath)) {
error_log("saving image");
$errors = $this->_mdh->getLastError();
$this->fillErrorAttributes($item);
$this->log("error copying $l2d/$bimgfile : {$errors["type"]},{$errors["message"]}", "warning");
unset($errors);
$this->setErrorImg($impath);
return false;
} else {
error_log("save image failed");
@$this->_mdh->chmod("$l2d/$bimgfile", Magmi_Config::getInstance()->getFileMask());

if ($this->getParam("IMG:storeindb", "no") == "yes") {
error_log("store in DB");
/* create target dirs if they don't exist */
$dir_table = $this->tablename('core_directory_storage');
// get "catalog/product" path ID
Expand Down Expand Up @@ -591,7 +572,6 @@ public function copyImageFile($imgfile, &$item, $extra)
}
$this->_lastimage = $impath;
/* return image file name relative to media dir (with leading / ) */
error_log("returning " . $impath);
return $impath;
}

Expand Down

0 comments on commit 8056e44

Please sign in to comment.