Skip to content

Fixes/changes to compatibility wrapper #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2015
Merged

Fixes/changes to compatibility wrapper #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2405349
Custom changes to process the way I like:
Scott-Cam Nov 22, 2014
211368a
oldToNewDescriptionItem - fix bug that returns errors when looking for
Scott-Cam Nov 22, 2014
e1e0d90
Changed findValueInArray to return false instead of null, updated
Scott-Cam Nov 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ToolkitApi/CW/cw.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2266,9 +2266,11 @@ function i5_spool_list($description = array(), $connection = null)

// if outq is not *ALL, it should have a library name
if (($outq != '*ALL') && empty($outqLibName)) {
// Try *LIBL
$outqLibName = '*LIBL';
// if no libname, result set will be empty, so might as well alert the user.
i5ErrorActivity(I5_ERR_PHP_ELEMENT_MISSING, I5_CAT_PHP, 'Missing outq library', 'You specified an outq but did not qualify it with a library name.');
return false;
//i5ErrorActivity(I5_ERR_PHP_ELEMENT_MISSING, I5_CAT_PHP, 'Missing outq library', 'You specified an outq but did not qualify it with a library name.');
// return false;
}
}

Expand Down Expand Up @@ -2755,7 +2757,8 @@ function listRead(&$list)
// we simply have no more records to receive.
$errorCode = $connection->getErrorCode();
if ($errorCode == '' || $errorCode == 'GUI0006' || $errorCode == 'GUI0001') {
i5ErrorActivity(I5_ERR_BEOF, I5_CAT_PHP, 'No more entries.', 'No more entries.');
// EOF is not an error, just clogs the log, completely normal, happens to everyone...
//i5ErrorActivity(I5_ERR_BEOF, I5_CAT_PHP, 'No more entries.', 'No more entries.');
} else {
// a real error.
i5CpfError($errorCode, $connection->getErrorMsg());
Expand Down
11 changes: 6 additions & 5 deletions ToolkitApi/CW/cwclasses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ public function splitPcmlProgramPath($path)
* and return the value associated with the key name provided.
*
* @param string $searchKey key to search for
* @return string|array|null value found in input array for array key. null if failed
* @return string|array|false value found in input array for array key. false if failed
*/
protected function findValueInArray($searchKey, $valueArray)
{
Expand All @@ -594,7 +594,7 @@ protected function findValueInArray($searchKey, $valueArray)
// ensure that array is not empty
if (!count($valueArray)) {
i5ErrorActivity(I5_ERR_PHP_TYPEPARAM, I5_CAT_PHP, "Array of input values must not be empty", "Array of input values must not be empty");
return null;
return false;
}

foreach ($valueArray as $key=>$value) {
Expand All @@ -608,7 +608,7 @@ protected function findValueInArray($searchKey, $valueArray)

// if failed, return null
// $connection->logThis("findValueInArray: searchKey: $searchKey. no value found");
return null;
return false;
}

/**
Expand Down Expand Up @@ -778,8 +778,9 @@ protected function oldToNewDescriptionItem($oldDataDescription = array(), $input
// Look up its value (could be another data structure or a single value)
// in the input array, based on data structure name.
$dsData = $this->findValueInArray($dsName, $inputValues);

if (!$dsData) {
// Compare with false since this is what findValueInArray returns on error
// this will prevent things such as empty arrays from causing errors
if ($dsData === false) {
// ds has no description to match value!
i5ErrorActivity(I5_ERR_PARAMNOTFOUND, I5_CAT_PHP, "Requested parameter '$dsName' does not exist in the input data", "Requested parameter $dsName does not exist in the input data");
return false;
Expand Down