recoll / Code / Diff of /src/common/rclconfig.cpp

Diff of /src/common/rclconfig.cpp [812e7b] .. [7bbf61]

Switch to unified view


...

    for (vector<string>::iterator it = dskpl.begin(); it != dskpl.end(); it++) {
    *it = path_tildexpand(*it);
    *it = path_canon(*it);
    }


    vector<string> skpl1 = getSkippedPaths();
    vector<string> skpl;
    if (dskpl.empty()) {
  skpl = skpl1;
    } else {
  sort(dskpl.begin(), dskpl.end());
  merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), 
        skpl.begin());
  unique(skpl.begin(), skpl.end());
    }
    return skpl;
}


// Look up an executable filter.  We look in $RECOLL_FILTERSDIR,

	a/src/common/rclconfig.cpp		b/src/common/rclconfig.cpp
	...		...
967		967
968	for (vector<string>::iterator it = dskpl.begin(); it != dskpl.end(); it++) {	968	for (vector<string>::iterator it = dskpl.begin(); it != dskpl.end(); it++) {
969	it = path_tildexpand(it);	969	it = path_tildexpand(it);
970	it = path_canon(it);	970	it = path_canon(it);
971	}	971	}
972	sort(dskpl.begin(), dskpl.end());
973		972
974	vector<string> skpl1 = getSkippedPaths();	973	vector<string> skpl1 = getSkippedPaths();
975	vector<string> skpl;	974	vector<string> skpl;
		975	if (dskpl.empty()) {
		976	skpl = skpl1;
		977	} else {
		978	sort(dskpl.begin(), dskpl.end());
976	merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), skpl.begin());	979	merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(),
		980	skpl.begin());
977	unique(skpl.begin(), skpl.end());	981	unique(skpl.begin(), skpl.end());
		982	}
978	return skpl;	983	return skpl;
979	}	984	}
980		985
981		986
982	// Look up an executable filter. We look in $RECOLL_FILTERSDIR,	987	// Look up an executable filter. We look in $RECOLL_FILTERSDIR,