Postfix comparison to check path

mattpass · mattpass · commit 3f1801ef2b4e · 2013-01-13T13:46:59.000Z
Establish a stringExtra value of a slash or nothing depending on wether
we are considering the root level or not
When comparing the folder against the selectedFile array value, postfix
both with a slash (could be any char though). This is to eliminate path
mismatches.
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
@@ -129,7 +129,8 @@ function phpGrep($q, $path, $base) {
 				}
 				$findPath = str_replace($base,"",$fullPath);
 				for ($i=0;$i<count($selectedFiles);$i++) {
-					if (strpos($findPath,str_replace("|","/",$selectedFiles[$i]))===0) {
+					$stringExtra = $selectedFiles[$i] != "|" ? "/" : "";
+					if (strpos($findPath.$stringExtra,str_replace("|","/",$selectedFiles[$i]).$stringExtra)===0) {
 						$foundInSelFile = true;
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,8 @@ function phpGrep($q, $path, $base) {`
`129`	`129`	`}`
`130`	`130`	`$findPath = str_replace($base,"",$fullPath);`
`131`	`131`	`for ($i=0;$i<count($selectedFiles);$i++) {`
`132`		`- if (strpos($findPath,str_replace("\|","/",$selectedFiles[$i]))===0) {`
	`132`	`+ $stringExtra = $selectedFiles[$i] != "\|" ? "/" : "";`
	`133`	`+ if (strpos($findPath.$stringExtra,str_replace("\|","/",$selectedFiles[$i]).$stringExtra)===0) {`
`133`	`134`	`$foundInSelFile = true;`
`134`	`135`	`}`
`135`	`136`	`}`