Attachment #1664 for bug #1730

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1730
Collapse All | Expand All

Lines 234-240 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/core/desktop.h (-2 / +2 lines)
234	return propertyFilter< Group >( IsInGroup( id ) );	234	return propertyFilter< Group >( IsInGroup( id ) );
235	}	235	}
236		236
237	static std::string projectGroup( ComposedList< Name > t ) {	237	/* static std::string projectGroup( ComposedList< Name > t ) {
238	return t.get< Group >();	238	return t.get< Group >();
239	}	239	}
240		240
Lines 245-251 Link Here
245	return list::unique(	245	return list::unique(
246	list::sort( list::map( list< Name >(),	246	list::sort( list::map( list< Name >(),
247	std::ptr_fun( &projectGroup ) ) ) );	247	std::ptr_fun( &projectGroup ) ) ) );
248	}	248	} */
249	};	249	};
250		250
251	template<> inline std::string Source::getInternal< Name >( Entry e ) {	251	template<> inline std::string Source::getInternal< Name >( Entry e ) {

Lines 51-57 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/core/desktop.test.h (-2 / +2 lines)
51	2, check, desk.group( "{ KDE, Qt, Utility }" ) );	51	2, check, desk.group( "{ KDE, Qt, Utility }" ) );
52	}	52	}
53		53
54	Test groupList() {	54	/* Test groupList() {
55	std::string check[] = {	55	std::string check[] = {
56	"{ Application, Game, X-SuSE-Core-Game }",	56	"{ Application, Game, X-SuSE-Core-Game }",
57	"{ KDE, Qt, Utility }",	57	"{ KDE, Qt, Utility }",
Lines 59-65 Link Here
59	};	59	};
60		60
61	assert_list_eq( desk.groupList(), check );	61	assert_list_eq( desk.groupList(), check );
62	}	62	}*/
63		63
64	Test emptyGroupList() {	64	Test emptyGroupList() {
65	desktop::InternalList l;	65	desktop::InternalList l;





time_t SourceDir::timestamp()
{
	if (!exists()) return 0;

	time_t max = 0;
	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type == SKIP) continue;

		time_t ts = Path::timestamp(str::joinpath(path(), *d));
		if (ts > max) max = ts;
	}



time_t SourceDir::vocTimestamp()
{
	if (!exists()) return 0;

	time_t max = 0;
	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type != VOC and type != VOCGZ) continue;

		time_t ts = Path::timestamp(str::joinpath(path(), *d));
		if (ts > max) max = ts;
	}



time_t SourceDir::tagTimestamp()
{
	if (!exists()) return 0;

	time_t max = 0;
	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type != TAG and type != TAGGZ) continue;

		time_t ts = Path::timestamp(str::joinpath(path(), *d));
		if (ts > max) max = ts;
	}



void SourceDir::readVocabularies(VocabularyMerger& out)
{
	if (!exists()) return;

	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type == VOC)
		{
			// Read uncompressed data
			tagcoll::input::Stdio in(str::joinpath(path(), *d));

			// Read the vocabulary
			out.read(in);

		else if (type == VOCGZ)
		{
			// Read compressed data
			tagcoll::input::Zlib in(str::joinpath(path(), *d));

			// Read the vocabulary
			out.read(in);




template<typename OUT>
void SourceDir::readTags(OUT out)
{
	if (!exists()) return;

	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type == TAG)
		{
			// Read uncompressed data
			tagcoll::input::Stdio in(path() + "/" + *d);

			// Read the collection
			tagcoll::textformat::parse(in, out);

		else if (type == TAGGZ)
		{
			// Read compressed data
			tagcoll::input::Zlib in(path() + "/" + *d);

			// Read the collection
			tagcoll::textformat::parse(in, out);





time_t SourceDir::timestamp()
{
	if (!exists()) return 0;

	time_t max = 0;
	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type == SKIP) continue;

		time_t ts = Path::timestamp(str::joinpath(path(), *d));
		if (ts > max) max = ts;
	}



bool SourceDir::readScores(map<std::string, Score>& out, size_t& submissions)
{
	if (!exists()) return false;
	bool done = false;

	for (const_iterator d = begin(); d != end(); ++d)
	{
		FileType type = fileType(*d);
		if (type == RAW)
		{
			// Read uncompressed data
			tagcoll::input::Stdio in(str::joinpath(path(), *d));

			// Read the scores
			parseScores(in, out, submissions);

		else if (type == RAWGZ)
		{
			// Read compressed data
			tagcoll::input::Zlib in(str::joinpath(path(), *d));

			// Read the scores
			parseScores(in, out, submissions);

Lines 46-55 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/token.h (-2 / +3 lines)
46	}	46	}
47	};	47	};
48		48
49	}
50
51	inline std::ostream &operator<<( std::ostream &o, const ept::Token &t ) {	49	inline std::ostream &operator<<( std::ostream &o, const ept::Token &t ) {
52	return o << t.id();	50	return o << t.id();
53	}	51	}
54		52
		53	}
		54
		55
55	#endif	56	#endif

Return to bug 1730

Lines 42-56 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/debtags/maint/sourcedir.cc (-13 / +13 lines)
42		42
43	time_t SourceDir::timestamp()	43	time_t SourceDir::timestamp()
44	{	44	{
45	if (!valid()) return 0;	45	if (!exists()) return 0;
46		46
47	time_t max = 0;	47	time_t max = 0;
48	for (const_iterator d = begin(); d != end(); ++d)	48	for (const_iterator d = begin(); d != end(); ++d)
49	{	49	{
50	FileType type = fileType(d->d_name);	50	FileType type = fileType(*d);
51	if (type == SKIP) continue;	51	if (type == SKIP) continue;
52		52
53	time_t ts = Path::timestamp(str::joinpath(path(), d->d_name));	53	time_t ts = Path::timestamp(str::joinpath(path(), *d));
54	if (ts > max) max = ts;	54	if (ts > max) max = ts;
55	}	55	}
56		56
Lines 59-73 Link Here
59		59
60	time_t SourceDir::vocTimestamp()	60	time_t SourceDir::vocTimestamp()
61	{	61	{
62	if (!valid()) return 0;	62	if (!exists()) return 0;
63		63
64	time_t max = 0;	64	time_t max = 0;
65	for (const_iterator d = begin(); d != end(); ++d)	65	for (const_iterator d = begin(); d != end(); ++d)
66	{	66	{
67	FileType type = fileType(d->d_name);	67	FileType type = fileType(*d);
68	if (type != VOC and type != VOCGZ) continue;	68	if (type != VOC and type != VOCGZ) continue;
69		69
70	time_t ts = Path::timestamp(str::joinpath(path(), d->d_name));	70	time_t ts = Path::timestamp(str::joinpath(path(), *d));
71	if (ts > max) max = ts;	71	if (ts > max) max = ts;
72	}	72	}
73		73
Lines 76-90 Link Here
76		76
77	time_t SourceDir::tagTimestamp()	77	time_t SourceDir::tagTimestamp()
78	{	78	{
79	if (!valid()) return 0;	79	if (!exists()) return 0;
80		80
81	time_t max = 0;	81	time_t max = 0;
82	for (const_iterator d = begin(); d != end(); ++d)	82	for (const_iterator d = begin(); d != end(); ++d)
83	{	83	{
84	FileType type = fileType(d->d_name);	84	FileType type = fileType(*d);
85	if (type != TAG and type != TAGGZ) continue;	85	if (type != TAG and type != TAGGZ) continue;
86		86
87	time_t ts = Path::timestamp(str::joinpath(path(), d->d_name));	87	time_t ts = Path::timestamp(str::joinpath(path(), *d));
88	if (ts > max) max = ts;	88	if (ts > max) max = ts;
89	}	89	}
90		90
Lines 93-107 Link Here
93		93
94	void SourceDir::readVocabularies(VocabularyMerger& out)	94	void SourceDir::readVocabularies(VocabularyMerger& out)
95	{	95	{
96	if (!valid()) return;	96	if (!exists()) return;
97		97
98	for (const_iterator d = begin(); d != end(); ++d)	98	for (const_iterator d = begin(); d != end(); ++d)
99	{	99	{
100	FileType type = fileType(d->d_name);	100	FileType type = fileType(*d);
101	if (type == VOC)	101	if (type == VOC)
102	{	102	{
103	// Read uncompressed data	103	// Read uncompressed data
104	tagcoll::input::Stdio in(str::joinpath(path(), d->d_name));	104	tagcoll::input::Stdio in(str::joinpath(path(), *d));
105		105
106	// Read the vocabulary	106	// Read the vocabulary
107	out.read(in);	107	out.read(in);
Lines 109-115 Link Here
109	else if (type == VOCGZ)	109	else if (type == VOCGZ)
110	{	110	{
111	// Read compressed data	111	// Read compressed data
112	tagcoll::input::Zlib in(str::joinpath(path(), d->d_name));	112	tagcoll::input::Zlib in(str::joinpath(path(), *d));
113		113
114	// Read the vocabulary	114	// Read the vocabulary
115	out.read(in);	115	out.read(in);

Lines 26-40 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/popcon/maint/sourcedir.cc (-7 / +7 lines)
26		26
27	time_t SourceDir::timestamp()	27	time_t SourceDir::timestamp()
28	{	28	{
29	if (!valid()) return 0;	29	if (!exists()) return 0;
30		30
31	time_t max = 0;	31	time_t max = 0;
32	for (const_iterator d = begin(); d != end(); ++d)	32	for (const_iterator d = begin(); d != end(); ++d)
33	{	33	{
34	FileType type = fileType(d->d_name);	34	FileType type = fileType(*d);
35	if (type == SKIP) continue;	35	if (type == SKIP) continue;
36		36
37	time_t ts = Path::timestamp(str::joinpath(path(), d->d_name));	37	time_t ts = Path::timestamp(str::joinpath(path(), *d));
38	if (ts > max) max = ts;	38	if (ts > max) max = ts;
39	}	39	}
40		40
Lines 109-124 Link Here
109		109
110	bool SourceDir::readScores(map<std::string, Score>& out, size_t& submissions)	110	bool SourceDir::readScores(map<std::string, Score>& out, size_t& submissions)
111	{	111	{
112	if (!valid()) return false;	112	if (!exists()) return false;
113	bool done = false;	113	bool done = false;
114		114
115	for (const_iterator d = begin(); d != end(); ++d)	115	for (const_iterator d = begin(); d != end(); ++d)
116	{	116	{
117	FileType type = fileType(d->d_name);	117	FileType type = fileType(*d);
118	if (type == RAW)	118	if (type == RAW)
119	{	119	{
120	// Read uncompressed data	120	// Read uncompressed data
121	tagcoll::input::Stdio in(str::joinpath(path(), d->d_name));	121	tagcoll::input::Stdio in(str::joinpath(path(), *d));
122		122
123	// Read the scores	123	// Read the scores
124	parseScores(in, out, submissions);	124	parseScores(in, out, submissions);
Lines 127-133 Link Here
127	else if (type == RAWGZ)	127	else if (type == RAWGZ)
128	{	128	{
129	// Read compressed data	129	// Read compressed data
130	tagcoll::input::Zlib in(str::joinpath(path(), d->d_name));	130	tagcoll::input::Zlib in(str::joinpath(path(), *d));
131		131
132	// Read the scores	132	// Read the scores
133	parseScores(in, out, submissions);	133	parseScores(in, out, submissions);

Lines 16-30 Link Here

(-)ori/libept-trinity-0.5.26+1/ept/debtags/maint/sourcedir.tcc (-4 / +4 lines)
16	template<typename OUT>	16	template<typename OUT>
17	void SourceDir::readTags(OUT out)	17	void SourceDir::readTags(OUT out)
18	{	18	{
19	if (!valid()) return;	19	if (!exists()) return;
20		20
21	for (const_iterator d = begin(); d != end(); ++d)	21	for (const_iterator d = begin(); d != end(); ++d)
22	{	22	{
23	FileType type = fileType(d->d_name);	23	FileType type = fileType(*d);
24	if (type == TAG)	24	if (type == TAG)
25	{	25	{
26	// Read uncompressed data	26	// Read uncompressed data
27	tagcoll::input::Stdio in(path() + "/" + d->d_name);	27	tagcoll::input::Stdio in(path() + "/" + *d);
28		28
29	// Read the collection	29	// Read the collection
30	tagcoll::textformat::parse(in, out);	30	tagcoll::textformat::parse(in, out);
Lines 32-38 Link Here
32	else if (type == TAGGZ)	32	else if (type == TAGGZ)
33	{	33	{
34	// Read compressed data	34	// Read compressed data
35	tagcoll::input::Zlib in(path() + "/" + d->d_name);	35	tagcoll::input::Zlib in(path() + "/" + *d);
36		36
37	// Read the collection	37	// Read the collection
38	tagcoll::textformat::parse(in, out);	38	tagcoll::textformat::parse(in, out);