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

Diff of /src/common/rclconfig.cpp [de8120] .. [20f79e]

Switch to unified view


...
    for (vector<string>::iterator it = skpl.begin(); it != skpl.end(); it++) {
    *it = path_tildexpand(*it);
    *it = path_canon(*it);
    }
    sort(skpl.begin(), skpl.end());
    vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
    skpl.resize(uit - skpl.begin());
    return skpl;
}

vector<string> RclConfig::getDaemSkippedPaths()
{
...
    skpl = skpl1;
    } else {
    sort(dskpl.begin(), dskpl.end());
    merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), 
          skpl.begin());
  vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
  skpl.resize(uit - skpl.begin());
    }
    return skpl;
}



	a/src/common/rclconfig.cpp		b/src/common/rclconfig.cpp
	...		...
954	for (vector<string>::iterator it = skpl.begin(); it != skpl.end(); it++) {	954	for (vector<string>::iterator it = skpl.begin(); it != skpl.end(); it++) {
955	it = path_tildexpand(it);	955	it = path_tildexpand(it);
956	it = path_canon(it);	956	it = path_canon(it);
957	}	957	}
958	sort(skpl.begin(), skpl.end());	958	sort(skpl.begin(), skpl.end());
959	unique(skpl.begin(), skpl.end());	959	vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
		960	skpl.resize(uit - skpl.begin());
960	return skpl;	961	return skpl;
961	}	962	}
962		963
963	vector<string> RclConfig::getDaemSkippedPaths()	964	vector<string> RclConfig::getDaemSkippedPaths()
964	{	965	{
	...		...
976	skpl = skpl1;	977	skpl = skpl1;
977	} else {	978	} else {
978	sort(dskpl.begin(), dskpl.end());	979	sort(dskpl.begin(), dskpl.end());
979	merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(),	980	merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(),
980	skpl.begin());	981	skpl.begin());
981	unique(skpl.begin(), skpl.end());	982	vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
		983	skpl.resize(uit - skpl.begin());
982	}	984	}
983	return skpl;	985	return skpl;
984	}	986	}
985		987
986		988