LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some ajustments for the CategoryFilter 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2326 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-09-29 08:59:26 +00:00
parent bf25dc8dd2
commit 23f468b359
1 changed files with 46 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java
View File

@ -9,7 +9,9 @@ import com.arsdigita.persistence.FilterFactory;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* *
@ -19,10 +21,10 @@ import java.util.List;
public class CategoryFilter { public class CategoryFilter {
private final String label; private final String label;
private String separator = " ";
private final Category filterRootCat; private final Category filterRootCat;
// private boolean descendCategories = true;
//private String value;
private final List<String> values = new ArrayList<String>(); private final List<String> values = new ArrayList<String>();
private final Map<String, String> catNameToCatId = new HashMap<String, String>();
public static CategoryFilter createCategoryFilter(final String label, final String categoryName) { public static CategoryFilter createCategoryFilter(final String label, final String categoryName) {
final DataCollection collection = SessionManager.getSession().retrieve( final DataCollection collection = SessionManager.getSession().retrieve(
@ -42,71 +44,40 @@ public class CategoryFilter {
public CategoryFilter(final String label, final Category filterRootCat) { public CategoryFilter(final String label, final Category filterRootCat) {
this.label = label; this.label = label;
this.filterRootCat = filterRootCat; this.filterRootCat = filterRootCat;
final CategoryCollection categories = filterRootCat.getChildren();
Category category;
while (categories.next()) {
category = categories.getCategory();
catNameToCatId.put(category.getName(), category.getID().toString());
}
} }
// public boolean getDescendCategories() {
// return descendCategories;
// }
//
// public void setDescendCategories(final boolean descendCategories) {
// this.descendCategories = descendCategories;
// }
public void applyFilter(final DataCollection objects) { public void applyFilter(final DataCollection objects) {
// for(String value : values) {
// if ((value != null) && !value.isEmpty()) {
// if(descendCategories) {
// com.arsdigita.persistence.Filter filter = objects.addInSubqueryFilter("parent.id",
// "com.arsdigita.categorization.objectIDsInSubtree");
// filter.set("categoryID", value);
// objects.addFilter(filter);
// } else {
// objects.addEqualsFilter("parent.categories.id", value);
// }
// }
// }
if (!values.isEmpty()) { if (!values.isEmpty()) {
// if (descendCategories) { final FilterFactory filterFactory = objects.getFilterFactory();
final FilterFactory filterFactory = objects.getFilterFactory(); final CompoundFilter compoundFilter = filterFactory.and();
final CompoundFilter compoundFilter = filterFactory.and(); for (String value : values) {
for (String value : values) { if (catNameToCatId.containsKey(value)) {
final com.arsdigita.persistence.Filter filter = filterFactory.in("parent.id", final com.arsdigita.persistence.Filter filter = filterFactory.in(
"com.arsdigita.categorization.objectIDsInSubtree"); "parent.id", "com.arsdigita.categorization.objectIDsInSubtree");
filter.set("categoryID", value); //filter.set("categoryID", value);
filter.set("categoryID", catNameToCatId.get(value));
compoundFilter.addFilter(filter); compoundFilter.addFilter(filter);
} }
}
objects.addFilter(compoundFilter); objects.addFilter(compoundFilter);
// com.arsdigita.persistence.Filter filter = objects.addInSubqueryFilter("parent.id",
// "com.arsdigita.categorization.objectIDsInSubtree");
// filter.set("categoryID", values.get(0));
// } else {
// final com.arsdigita.persistence.Filter filter = objects.addFilter(
// "parent.categories.id IN :categories");
// filter.set("categories", values);
//objects.addEqualsFilter("parent.categories.id", values.get(0));
// final FilterFactory filterFactory = objects.getFilterFactory();
// final CompoundFilter compoundFilter = filterFactory.or();
// for (String value : values) {
// final com.arsdigita.persistence.Filter filter = filterFactory.equals(
// "parent.categories.id", value);
// compoundFilter.addFilter(filter);
// }
//
// objects.addFilter(compoundFilter);
// }
} }
} }
public Element getXml() { public Element getXml() {
final Element filter = new Element("filter"); final Element filter = new Element("filter");
final Element invalid = new Element("invalid");
filter.addAttribute("name", "categoryFilter"); filter.addAttribute("name", "categoryFilter");
filter.addAttribute("label", label); filter.addAttribute("label", label);
final CategoryCollection categories = filterRootCat.getChildren(); final CategoryCollection categories = filterRootCat.getChildren();
@ -118,23 +89,40 @@ public class CategoryFilter {
addCategoryToFilter(filter, category); addCategoryToFilter(filter, category);
} }
for(String value : values) {
if (!catNameToCatId.containsKey(value)) {
invalid.newChildElement("value").setText(value);
}
}
filter.addContent(invalid);
return filter; return filter;
} }
private void addCategoryToFilter(final Element parent, final Category category) { private void addCategoryToFilter(final Element parent,
final Category category) {
final Element elem = new Element("category"); final Element elem = new Element("category");
elem.addAttribute("id", category.getID().toString()); elem.addAttribute("id", category.getID().toString());
//if ((value != null) && !value.isEmpty() && value.equals(category.getID().toString())) { //if ((values != null) && !values.isEmpty() && values.contains(category.getID().toString())) {
if ((values != null) && !values.isEmpty() && values.contains(category.getID().toString())) { if ((values != null) && !values.isEmpty() && values.contains(category.getName())) {
elem.addAttribute("selected", "selected"); elem.addAttribute("selected", "selected");
} }
elem.setText(category.getName()); elem.setText(category.getName());
parent.addContent(elem); parent.addContent(elem);
} }
public String getSeparator() {
return separator;
}
public void setSeparator(final String separator) {
this.separator = separator;
}
public void setValue(final String value) { public void setValue(final String value) {
if ((value != null) && !value.isEmpty()) { if ((value != null) && !value.isEmpty()) {
final String[] tokens = value.split(" "); final String[] tokens = value.split(separator);
for (String token : tokens) { for (String token : tokens) {
values.add(token.trim()); values.add(token.trim());
} }