Author: baby-guest
Date: 2007-07-06 17:03:37 +0000 (Fri, 06 Jul 2007)
New Revision: 3257
Modified:
software/ui/src/filter.cpp
Log:
Filter works correctly now
Modified: software/ui/src/filter.cpp
===================================================================
--- software/ui/src/filter.cpp 2007-07-06 16:40:24 UTC (rev 3256)
+++ software/ui/src/filter.cpp 2007-07-06 17:03:37 UTC (rev 3257)
@@ -31,12 +31,6 @@
int PackageFilter::TagValue(const Tag &tag)
{
- const char *facet_name = tag.facet().name().c_str();
- const char *tag_name = tag.name().c_str();
- printf("** FACET %s / %s NAME %s / %s / %s\n",
- facet_name, tag.facet().shortDescription().c_str(),
- tag_name, tag.fullname().c_str(),
tag.shortDescription().c_str());
-
// The order is important to minimize calculation costs
if (GreenTag(tag)) return PackageFilter::Green;
if (BlackTag(tag)) return PackageFilter::Black;
@@ -47,49 +41,48 @@
bool PackageFilter::GreenTag(const Tag &tag)
{
- const char *name = tag.fullname().c_str();
- if (strcmp(name, FACET_VIOLENCE "::none") == 0) return true;
- if (strcmp(name, FACET_SEX "::none") == 0) return true;
- if (strcmp(name, FACET_LANGUAGE "::benign") == 0) return true;
- if (strcmp(name, FACET_DISCRIMINATION "::none") == 0) return true;
+ std::string name = tag.fullname();
+ if (name == FACET_VIOLENCE "::none") return true;
+ if (name == FACET_SEX "::none") return true;
+ if (name == FACET_LANGUAGE "::benign") return true;
+ if (name == FACET_DISCRIMINATION "::none") return true;
return false;
}
bool PackageFilter::YellowTag(const Tag &tag)
{
- const char *name = tag.fullname().c_str();
- if (strcmp(name, FACET_VIOLENCE "::brief") == 0) return true;
- if (strcmp(name, FACET_SEX "::minor") == 0) return true;
- if (strcmp(name, FACET_SEX "::nudity") == 0) return true;
+ std::string name = tag.fullname();
+ if (name == FACET_VIOLENCE "::none") return true;
+ if (name == FACET_SEX "::minor") return true;
+ if (name == FACET_SEX "::nudity") return true;
return false;
}
bool PackageFilter::RedTag(const Tag &tag)
{
- const char *facet_name = tag.facet().name().c_str();
- const char *tag_name = tag.name().c_str();
- if (strcmp(facet_name, FACET_VIOLENCE) == 0)
+ std::string facet_name = tag.facet().name();
+ std::string tag_name = tag.name();
+ if (facet_name == FACET_VIOLENCE)
{
- printf("** FACET %s NAME %s\n", facet_name, tag_name);
- if (strcmp(tag_name, "none") == 0) return false;
- if (strcmp(tag_name, "brief") == 0) return false;
- if (strcmp(tag_name, "minor") == 0) return false;
+ if (tag_name == "none") return false;
+ if (tag_name == "brief") return false;
+ if (tag_name == "minor") return false;
return true;
}
- else if (strcmp(facet_name, FACET_SEX) == 0)
+ else if (facet_name == FACET_SEX)
{
- if (strcmp(tag_name, "none") == 0) return false;
- if (strcmp(tag_name, "nudity") == 0) return false;
+ if (tag_name == "none") return false;
+ if (tag_name == "nudity") return false;
return true;
}
- else if (strcmp(facet_name, FACET_LANGUAGE) == 0)
+ else if (facet_name == FACET_LANGUAGE)
{
- if (strcmp(tag_name, "benign") == 0) return false;
+ if (tag_name == "benign") return false;
return true;
}
- else if (strcmp(facet_name, FACET_DISCRIMINATION) == 0)
+ else if (facet_name == FACET_DISCRIMINATION)
{
- if (strcmp(tag_name, "none") == 0) return false;
+ if (tag_name == "none") return false;
return true;
}
return false;
@@ -97,10 +90,10 @@
bool PackageFilter::BlackTag(const Tag &tag)
{
- const char *name = tag.fullname().c_str();
- if (strcmp(name, FACET_VIOLENCE "::hard") == 0) return true;
- if (strcmp(name, FACET_SEX "::hard") == 0) return true;
- if (strcmp(name, FACET_SEX "::violence") == 0) return true;
+ std::string name = tag.fullname();
+ if (name == FACET_VIOLENCE "::hard") return true;
+ if (name == FACET_SEX "::hard") return true;
+ if (name == FACET_SEX "::violence") return true;
return false;
}
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
