- Wikitty-commits - mailman.cloud.codelutin.com

r986 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortun＠users.nuiton.org June 28, 2011

June 28, 2011

Author: mfortun Date: 2011-06-28 17:38:39 +0200 (Tue, 28 Jun 2011) New Revision: 986 Url: http://nuiton.org/repositories/revision/wikitty/986 Log: * continue migration to new taglib architecture Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java Removed: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,49 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag", + description = "", allowDynamicAttributes = false) public class BooleanBean extends ClosingUIBean { public BooleanBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-boolean"; + public static final String TEMPLATE = "ws-boolean-close"; + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsBoolean(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -8,12 +8,12 @@ protected String name; protected String type; - protected Object value; + protected Object value =""; protected String label; protected Collection<Option> listOption; public ExtensionFieldStrutsBean() { - listOption = new LinkedList<ExtensionFieldStrutsBean.Option>(); + listOption = new LinkedList<Option>(); } public Collection<Option> getListOption() { return listOption; @@ -55,24 +55,6 @@ } - public class Option { - - protected String valeur; - protected String description; - public String getValeur() { - return valeur; - } - public void setValeur(String valeur) { - this.valeur = valeur; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - - } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -1,26 +1,60 @@ package org.nuiton.wikitty.struts.component; +import java.util.LinkedList; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.ClosingUIBean; - +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; -public class FixedSelectBean extends ClosingUIBean { - - +@StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) +public class FixedSelectBean extends ClosingUIBean { + protected String fixvalues; public FixedSelectBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-fixedselect"; + public static final String TEMPLATE = "ws-fixedselect-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + String[] values = StringUtil.split(fixvalues, ","); + for (String it : values) { + fixlist.add(new Option(it,it)); + } + addParameter("fixvalues", fixlist); + + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the + // stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } @@ -36,5 +70,5 @@ public void setFixvalues(String fixvalues) { this.fixvalues = fixvalues; } - + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,48 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", + description = "", allowDynamicAttributes = false) public class HiddenBean extends ClosingUIBean { public HiddenBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-hidden"; + public static final String TEMPLATE = "ws-hidden-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,30 @@ +package org.nuiton.wikitty.struts.component; + +public class Option { + + protected String valeur; + protected String description; + public String getValeur() { + return valeur; + } + public void setValeur(String valeur) { + this.valeur = valeur; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + public Option() { + + } + public Option(String valeur, String description) { + this.valeur = valeur; + this.description = description; + } + + + +} \ No newline at end of file Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,49 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", + description = "", allowDynamicAttributes = false) public class TextAreaBean extends ClosingUIBean { public TextAreaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-textarea"; + public static final String TEMPLATE = "ws-textarea-close"; + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,47 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) public class TextFieldBean extends ClosingUIBean { - + public TextFieldBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-textfield"; + public static final String TEMPLATE = "ws-textfield-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 15:38:39 UTC (rev 986) @@ -306,5 +306,8 @@ } return result; } - + + public boolean isIncluded(String fieldname) { + return true; + } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -7,7 +7,8 @@ import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", description = "Renders an input form", allowDynamicAttributes = false) +@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", + description = "", allowDynamicAttributes = false) public class WikittyFieldTagBean extends ClosingUIBean { protected FieldSpecialisation specialize; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -1,12 +1,22 @@ package org.nuiton.wikitty.struts.component; +import java.util.LinkedList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) public class WikittySelectBean extends ClosingUIBean { protected String criteria; @@ -15,11 +25,10 @@ public WikittySelectBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-wikittyselect"; + public static final String TEMPLATE = "ws-wikittyselect-close"; public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; @@ -29,6 +38,68 @@ return TEMPLATE; } + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + + // search for the wikitty with the criteria + Criteria criteria = Search.query().keyword(this.criteria) + .criteria(); + PagedResult<Wikitty> wikitties = handler.getProxy() + .findAllByCriteria(criteria); + + String[] descriptor = StringUtil.split(descfield, ","); + + // if wikitties not null contruct option result + // with descriptor + if (wikitties != null) { + for (Wikitty wiki : wikitties) { + // by default value and description are the same + // wikitty id + String val = wiki.getId(); + + String desc = wiki.getId(); + + // if attribute descripteur fill with something + // extract from wikitty corresponding field value + if (descriptor.length != 0) { + desc = ""; + for (String descriptorIt : descriptor) { + String[] descTable = StringUtil.split( + descriptorIt, "."); + + desc += wiki.getFieldAsString(descTable[0], + descTable[1]); + } + } + fixlist.add(new Option(val, desc)); + } + addParameter("wikittiesvalues", fixlist); + } + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the + // stack + } + } + public String getCriteria() { return criteria; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -8,7 +8,8 @@ import org.nuiton.wikitty.entities.Wikitty; import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", description = "Renders an input form", allowDynamicAttributes = false) +@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", + description = "", allowDynamicAttributes = false) public class WikittyTagBean extends ClosingUIBean { public static final String OPEN_TEMPLATE = "wikitty"; @@ -17,7 +18,7 @@ protected Wikitty wikitty; protected WikittyProxy proxy; - protected String type; + protected String action; protected String redirect; @@ -83,39 +84,6 @@ * parametters à écrire dans le template on va correctement ajouter le * tout. */ - - /* - * if (validate != null) { addParameter("validate", findValue(validate, - * Boolean.class)); } - * - * if (name == null) { //make the name the same as the id String id = - * (String) getParameters().get("id"); if (StringUtils.isNotEmpty(id)) { - * addParameter("name", id); } } - * - * - * - * if (onreset != null) { addParameter("onreset", findString(onreset)); - * } - * - * if (target != null) { addParameter("target", findString(target)); } - * - * if (enctype != null) { addParameter("enctype", findString(enctype)); - * } - * - * if (method != null) { addParameter("method", findString(method)); } - * - * if (acceptcharset != null) { addParameter("acceptcharset", - * findString(acceptcharset)); } - * - * // keep a collection of the tag names for anything special the - * templates might want to do (such as pure client // side validation) - * if (!parameters.containsKey("tagNames")) { // we have this if check - * so we don't do this twice (on open and close of the template) - * addParameter("tagNames", new ArrayList()); } - * - * if (focusElement != null) { addParameter("focusElement", - * findString(focusElement)); } - */ } public String getDefaultOpenTemplate() { @@ -142,14 +110,6 @@ this.proxy = proxy; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-28 15:38:39 UTC (rev 986) @@ -9,28 +9,35 @@ import com.opensymphony.xwork2.util.ValueStack; -public class FixedSelectTag extends AbstractClosingTag{ - +public class FixedSelectTag extends AbstractClosingTag { + /** * */ private static final long serialVersionUID = -8415432856577152486L; protected String fixvalues; - + @Override public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new FixedSelectBean(stack, req, res); } - - + @Override protected void populateParams() { super.populateParams(); FixedSelectBean fieldtag = ((FixedSelectBean) component); - + fieldtag.setFixvalues(fixvalues); - + } - + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-28 15:38:39 UTC (rev 986) @@ -18,7 +18,6 @@ private static final long serialVersionUID = 258152544560583399L; protected Wikitty wikitty; protected WikittyProxy proxy; - protected String type; protected String action; protected String redirect; @@ -74,7 +73,6 @@ wikittyTag.setRedirect(redirect); wikittyTag.setWikitty(wikitty); wikittyTag.setProxy(proxy); - wikittyTag.setType(type); wikittyTag.setOrder(order); wikittyTag.setAllowDelete(allowDelete); wikittyTag.setInclude(include); @@ -97,14 +95,6 @@ this.proxy = proxy; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,7 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,12 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select name="${parameters.name}" size="1"> +<#assign optionKeys = parameters.fixvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==parameters.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1,2 +1,12 @@ -parameters - +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select name="${parameters.name}" size="1"> +<#assign optionKeys = parameters.wikittiesvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==parameters.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-28 15:38:39 UTC (rev 986) @@ -35,11 +35,6 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <description><![CDATA[Type of the form: Form classic or pop-up form]]></description> - <name>type</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> <description><![CDATA[Field/extention that must appear in the form, if defined other wikitty field will be ignored. if not defined all wikitty field will be presented. @@ -97,6 +92,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -109,6 +105,7 @@ <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> <name>fixvalues</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> @@ -120,12 +117,13 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> <tag> - <name>wikittyField</name> + <name>Field</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyFieldTag</tagclass> <bodycontent>empty</bodycontent> <description><![CDATA[Field to specialise how wikitty field will be presented]]></description> @@ -139,7 +137,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - </attribute> + </attribute> <attribute> <description><![CDATA[html type to present the field: hidden, textfield, textarea, boolean, file]]></description> <name>type</name> @@ -194,6 +192,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -211,6 +210,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -228,10 +228,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> - - - - </taglib>

1 0

r985 - in trunk/wikitty-jdbc: . src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 17:28:07 +0200 (Tue, 28 Jun 2011) New Revision: 985 Url: http://nuiton.org/repositories/revision/wikitty/985 Log: #1600 Remove deprecated WikittyService implementation Removed: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java Modified: trunk/wikitty-jdbc/pom.xml Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-06-28 15:18:40 UTC (rev 984) +++ trunk/wikitty-jdbc/pom.xml 2011-06-28 15:28:07 UTC (rev 985) @@ -25,7 +25,7 @@ <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr</artifactId> <version>${project.version}</version> -  + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> Deleted: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2011-06-28 15:18:40 UTC (rev 984) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2011-06-28 15:28:07 UTC (rev 985) @@ -1,55 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-jdbc-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.jdbc; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyServiceFactory; -import org.nuiton.wikitty.services.WikittyServiceStorage; -import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; - -/** - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - * @deprecated use WikittyServiceFactory is good config file - * @see WikittyServiceFactory - */ -public class WikittyServiceJDBC extends WikittyServiceStorage { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyServiceJDBC.class); - - public WikittyServiceJDBC(ApplicationConfig config) { - extensionStorage = new WikittyExtensionStorageJDBC(config); - wikittyStorage = new WikittyStorageJDBC(config, extensionStorage); - searchEngine = new WikittySearchEngineSolr(config, extensionStorage); - } - -}

1 0

r984 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 17:18:40 +0200 (Tue, 28 Jun 2011) New Revision: 984 Url: http://nuiton.org/repositories/revision/wikitty/984 Log: Do not store attached all field Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 15:08:10 UTC (rev 983) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 15:18:40 UTC (rev 984) @@ -618,7 +618,7 @@ for (String id : treeNodeParents) { //doc.addField(TREENODE_ATTACHED + treeNodeId, id); doc.add(new Field(TREENODE_ATTACHED + treeNodeId, id, Store.YES, Index.NOT_ANALYZED)); - doc.add(new Field(TREENODE_ATTACHED_ALL, id, Store.YES, Index.NOT_ANALYZED)); + doc.add(new Field(TREENODE_ATTACHED_ALL, id, Store.NO, Index.NOT_ANALYZED)); } } }

1 0

r983 - in trunk/wikitty-lucene/src: main/java/org/nuiton/wikitty/storage/lucene test/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 17:08:10 +0200 (Tue, 28 Jun 2011) New Revision: 983 Url: http://nuiton.org/repositories/revision/wikitty/983 Log: FIx facet on multi valued fields. All test now pass \o/ Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 14:47:28 UTC (rev 982) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 15:08:10 UTC (rev 983) @@ -103,6 +103,7 @@ import com.browseengine.bobo.api.FacetAccessible; import com.browseengine.bobo.api.FacetSpec; import com.browseengine.bobo.facets.FacetHandler; +import com.browseengine.bobo.facets.impl.MultiValueFacetHandler; import com.browseengine.bobo.facets.impl.SimpleFacetHandler; /** @@ -851,7 +852,7 @@ List<FacetHandler<?>> facetHandlers = new ArrayList<FacetHandler<?>>(); if (facetFields != null) { for (String facetField : facetFields) { - SimpleFacetHandler facetHandler = new SimpleFacetHandler(facetField); + MultiValueFacetHandler facetHandler = new MultiValueFacetHandler(facetField); facetHandlers.add(facetHandler); } } Modified: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java =================================================================== --- trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2011-06-28 14:47:28 UTC (rev 982) +++ trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2011-06-28 15:08:10 UTC (rev 983) @@ -36,6 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; @@ -49,6 +50,7 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; @@ -58,7 +60,7 @@ /** * Test for class {@link WikittySearchEngineLucene}. * - * @author poussin + * @author echatellier * @version $Revision$ * * Last update: $Date$ @@ -392,4 +394,91 @@ PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); Assert.assertEquals(1, result.getNumFound()); } + + /** + * Test que l'implementation des facettes sur bobo fonctionne correctement. + */ + @Test + public void testLuceneFacets() { + WikittyTreeNode myLabel1 = new WikittyTreeNodeImpl(); + myLabel1.setName("apple"); + WikittyTreeNode myLabel2 = new WikittyTreeNodeImpl(); + myLabel2.setName("apple"); + WikittyTreeNode myLabel3 = new WikittyTreeNodeImpl(); + myLabel3.setName("babana"); + WikittyTreeNode myLabel4 = new WikittyTreeNodeImpl(); + myLabel4.setName("babana"); + WikittyTreeNode myLabel5 = new WikittyTreeNodeImpl(); + myLabel5.setName("pineapple"); // ananas + + proxy.store(myLabel1, myLabel2, myLabel3, myLabel4, myLabel5); + + Criteria criteria = Search.query().exteq(WikittyTreeNode.EXT_WIKITTYTREENODE).criteria(); + criteria.addFacetField(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME); + criteria.setEndIndex(0); // just count + PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); + + // just les nombre pour chaque facette + List<FacetTopic> nameTopics = result.getFacets().get(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME); + Assert.assertEquals(3, nameTopics.size()); + for (FacetTopic nameTopic : nameTopics) { + if (log.isInfoEnabled()) { + log.info("Facet found " + nameTopic.getTopicName() + " : " + nameTopic.getCount()); + } + if (nameTopic.getTopicName().equals("apple")) { + Assert.assertEquals(2, nameTopic.getCount()); + } else if (nameTopic.getTopicName().equals("babana")) { + Assert.assertEquals(2, nameTopic.getCount()); + } else if (nameTopic.getTopicName().equals("pineapple")) { + Assert.assertEquals(1, nameTopic.getCount()); + } else { + Assert.fail("Unknown topic value : " + nameTopic.getTopicName()); + } + } + } + + /** + * Test que l'implementation des facettes sur bobo fonctionne correctement. + * Test une facet criteria. + * + * TODO bobo n'a pas l'air de supporter les facettes de type query + */ + @Ignore + public void testLuceneFacetCriteria() { + WikittyTreeNode myLabel1 = new WikittyTreeNodeImpl(); + myLabel1.setName("apple"); + WikittyTreeNode myLabel2 = new WikittyTreeNodeImpl(); + myLabel2.setName("apple"); + WikittyTreeNode myLabel3 = new WikittyTreeNodeImpl(); + myLabel3.setName("babana"); + WikittyTreeNode myLabel4 = new WikittyTreeNodeImpl(); + myLabel4.setName("babana"); + WikittyTreeNode myLabel5 = new WikittyTreeNodeImpl(); + myLabel5.setName("pineapple"); // ananas + + proxy.store(myLabel1, myLabel2, myLabel3, myLabel4, myLabel5); + + Criteria nameFacet = Search.query().keyword("*apple").criteria(); + nameFacet.setName("allapples"); + Criteria criteria = Search.query().exteq(WikittyTreeNode.EXT_WIKITTYTREENODE).criteria(); + criteria.addFacetCriteria(nameFacet); + criteria.setEndIndex(0); // just count + PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); + + // just les nombre pour chaque facette + List<FacetTopic> nameTopics = result.getFacets().get("allapples"); + Assert.assertEquals(2, nameTopics.size()); + for (FacetTopic nameTopic : nameTopics) { + if (log.isInfoEnabled()) { + log.info("Facet found " + nameTopic.getTopicName() + " : " + nameTopic.getCount()); + } + if (nameTopic.getTopicName().equals("apple")) { + Assert.assertEquals(2, nameTopic.getCount()); + } else if (nameTopic.getTopicName().equals("pineapple")) { + Assert.assertEquals(1, nameTopic.getCount()); + } else { + Assert.fail("Unknown topic value : " + nameTopic.getTopicName()); + } + } + } }

1 0

r982 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 16:47:28 +0200 (Tue, 28 Jun 2011) New Revision: 982 Url: http://nuiton.org/repositories/revision/wikitty/982 Log: Ajout du support de la facetisation sur bobo Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 12:34:17 UTC (rev 981) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-28 14:47:28 UTC (rev 982) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.storage.lucene; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.LUCENE_DEFAULT_FIELD; import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.LUCENE_ID; import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_ATTACHED; import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_ATTACHED_ALL; @@ -56,6 +57,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; +import org.apache.lucene.document.Fieldable; +import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; @@ -64,11 +67,9 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; -import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.util.Version; @@ -77,7 +78,6 @@ import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyTreeNode; @@ -92,6 +92,19 @@ import org.nuiton.wikitty.storage.WikittyExtensionStorage; import org.nuiton.wikitty.storage.WikittySearchEngine; +import com.browseengine.bobo.api.BoboBrowser; +import com.browseengine.bobo.api.BoboIndexReader; +import com.browseengine.bobo.api.Browsable; +import com.browseengine.bobo.api.BrowseException; +import com.browseengine.bobo.api.BrowseFacet; +import com.browseengine.bobo.api.BrowseHit; +import com.browseengine.bobo.api.BrowseRequest; +import com.browseengine.bobo.api.BrowseResult; +import com.browseengine.bobo.api.FacetAccessible; +import com.browseengine.bobo.api.FacetSpec; +import com.browseengine.bobo.facets.FacetHandler; +import com.browseengine.bobo.facets.impl.SimpleFacetHandler; + /** * Wikitty search engine implementation based on Lucene for storage and search * engine and bobo for facetting support. @@ -225,40 +238,6 @@ /* * @see org.nuiton.wikitty.storage.WikittySearchEngine#store(org.nuiton.wikitty.services.WikittyTransaction, java.util.Collection, boolean) - * - @Override - public void store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean force) throws WikittyException { - - // TODO manage transaction - - IndexWriter writer = null; - try { - // must be instancied every time (single instance per writer) - IndexWriterConfig indexWriterConfig = new IndexWriterConfig(WIKITTY_LUCENE_VERSION, indexAnalyzer); - writer = new IndexWriter(indexDirectory, indexWriterConfig); - - for (Wikitty w : wikitties) { - Document wDoc = convertWikittyToDoc(w); - writer.addDocument(wDoc); - } - - writer.commit(); - - } catch (IOException ex) { - try { - writer.rollback(); - } catch (IOException e) { - throw new WikittyException("Can't rollback index", ex); - } - throw new WikittyException("Can't store to index", ex); - } finally { - IOUtils.closeQuietly(writer); - } - }*/ - - /* - * @see org.nuiton.wikitty.storage.WikittySearchEngine#store(org.nuiton.wikitty.services.WikittyTransaction, java.util.Collection, boolean) */ @Override public void store(WikittyTransaction transaction, @@ -585,9 +564,11 @@ addedDocs.put(attId, doc); } doc.removeField(TREENODE_ATTACHED + treeNodeId); + doc.removeField(TREENODE_ATTACHED_ALL); } } } + for (String treeNodeId : attachmentInTree.getAdded().keySet()) { Collection<String> treeNodeParents = null; Document treeNodeDoc = addedDocs.get(treeNodeId); @@ -603,7 +584,7 @@ String[] treeNodeParent = doc.getValues(TREENODE_PARENTS); treeNodeParents = Arrays.asList(treeNodeParent); } else { - log.error("SolR doc not found in Transaction or in tree." + log.error("Lucene doc not found in Transaction or in tree." + "This is a bug !!!"); } // add tree indexation on all attachments for this treeNodeId @@ -636,6 +617,7 @@ for (String id : treeNodeParents) { //doc.addField(TREENODE_ATTACHED + treeNodeId, id); doc.add(new Field(TREENODE_ATTACHED + treeNodeId, id, Store.YES, Index.NOT_ANALYZED)); + doc.add(new Field(TREENODE_ATTACHED_ALL, id, Store.YES, Index.NOT_ANALYZED)); } } } @@ -725,9 +707,11 @@ // wikitty extension String extAsString = StringUtils.join(w.getExtensionNames(), ","); - Field luceneExtField = new Field(WikittyLuceneConstants.LUCENE_EXTENSIONS, + if (!extAsString.isEmpty()) { + Field luceneExtField = new Field(WikittyLuceneConstants.LUCENE_EXTENSIONS, extAsString, Store.YES, Index.NOT_ANALYZED); - document.add(luceneExtField); + document.add(luceneExtField); + } StringBuffer allAsText = new StringBuffer(); // all other wikitty fields @@ -767,7 +751,7 @@ } // le champ text n'est pas stocké - Field luceneFullTextField = new Field(WikittyLuceneConstants.LUCENE_DEFAULT_FIELD, + Field luceneFullTextField = new Field(LUCENE_DEFAULT_FIELD, allAsText.toString(), Store.NO, Index.ANALYZED); document.add(luceneFullTextField); @@ -815,15 +799,15 @@ * @see org.nuiton.wikitty.storage.WikittySearchEngine#findAllByCriteria(org.nuiton.wikitty.services.WikittyTransaction, org.nuiton.wikitty.search.Criteria) */ @Override - public PagedResult<String> findAllByCriteria( - WikittyTransaction transaction, Criteria criteria) throws WikittyException { + public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, + Criteria criteria) throws WikittyException { // TODO manage transaction PagedResult<String> pagedResult = null; - IndexSearcher searcher = null; + IndexReader indexReader = null; try { - searcher = new IndexSearcher(indexDirectory); + indexReader = IndexReader.open(indexDirectory); // get lucene query Restriction restriction = criteria.getRestriction(); @@ -859,11 +843,95 @@ int firstIndex = criteria.getFirstIndex(); int endIndex = criteria.getEndIndex(); if (endIndex < 0) { - endIndex = searcher.maxDoc(); + endIndex = indexReader.maxDoc(); // indexSearcher.maxDoc(); } + + // facetting support : bobo + List<String> facetFields = criteria.getFacetField(); + List<FacetHandler<?>> facetHandlers = new ArrayList<FacetHandler<?>>(); + if (facetFields != null) { + for (String facetField : facetFields) { + SimpleFacetHandler facetHandler = new SimpleFacetHandler(facetField); + facetHandlers.add(facetHandler); + } + } + BoboIndexReader boboReader = BoboIndexReader.getInstance(indexReader, facetHandlers); + // get browse request + BrowseRequest br = new BrowseRequest(); + br.setOffset(firstIndex); + br.setCount(endIndex - firstIndex); + br.setQuery(query); + if (sortFields.isEmpty()) { + SortField[] sortFieldsA = sortFields.toArray(new SortField[sortFields.size()]); + br.setSort(sortFieldsA); + } + + // manage facets + //Map<String, String> facetQueryToName = new HashMap<String, String>(); + + //List<Criteria> facetCriterias = criteria.getFacetCriteria(); + if (facetFields != null) { + for (String facetField : facetFields) { + FacetSpec facetSpec = new FacetSpec(); + //facetSpec.setOrderBy(FacetSortSpec.OrderHitsDesc); + facetSpec.setMinHitCount(1); + br.setFacetSpec(facetField, facetSpec); + } + } + + /*// manage criteria facets + List<Criteria> facetCriterias = criteria.getFacetCriteria(); + if (facetCriterias != null) { + for (Criteria facetCriteria : facetCriterias) { + Query facetQuery = restriction2Lucene.toLucene(facetCriteria.getRestriction()); + } + }*/ + + // perform request + Browsable browser = new BoboBrowser(boboReader); + BrowseResult result = browser.browse(br); + + // manage request results (real results) + int pagedResultCount = result.getNumHits(); + BrowseHit[] hits = result.getHits(); + List<String> results = new ArrayList<String>(); + for (BrowseHit hit : hits) { + //if (currentDocIndex >= firstIndex && currentDocIndex <= endIndex) { + int luceneId = hit.getDocid(); + Document document = indexReader.document(luceneId); + String wikittyId = document.get(WikittyLuceneConstants.LUCENE_ID); + results.add(wikittyId); + //} + } + + // manage result facets + Map<String, FacetAccessible> resultFacets = result.getFacetMap(); + Map<String, List<FacetTopic>> pagedResultFacets = new HashMap<String, List<FacetTopic>>(); + for (Map.Entry<String, FacetAccessible> resultFacet : resultFacets.entrySet()) { + String facetName = resultFacet.getKey(); + FacetAccessible facetValue = resultFacet.getValue(); + + List<FacetTopic> facetTopics = new ArrayList<FacetTopic>(); + List<BrowseFacet> browseFacets = facetValue.getFacets(); + for (BrowseFacet browseFacet : browseFacets) { + FacetTopic topic = new FacetTopic(facetName, browseFacet.getValue(), + browseFacet.getFacetValueHitCount()); + facetTopics.add(topic); + } + + pagedResultFacets.put(facetName, facetTopics); + + // clean up. This is to free up the resources used in facet counting + // and this is new for bobo 2.5. Very important to call. + facetValue.close(); + } + + pagedResult = new PagedResult<String>(firstIndex, pagedResultCount, + query.toString(), pagedResultFacets, results); + // execute search query - List<String> results = new ArrayList<String>(); + /*List<String> results = new ArrayList<String>(); int totalHitCount = 0; if (endIndex == 0) { // il faut un cas special pour le 0, sinon lucene rale. @@ -896,15 +964,17 @@ } totalHitCount = topDocs.totalHits; - } - - pagedResult = new PagedResult<String>(firstIndex, totalHitCount, + + pagedResult = new PagedResult<String>(firstIndex, totalHitCount, query.toString(), null, results); + }*/ } catch (IOException ex) { throw new WikittyException("Can't search on index", ex); + } catch (BrowseException ex) { + throw new WikittyException("Can't search on index", ex); } finally { - IOUtils.closeQuietly(searcher); + IOUtils.closeQuietly(indexReader); } return pagedResult; @@ -1055,12 +1125,15 @@ Document doc = searcher.doc(scoreDoc.doc); String id = doc.getFieldable(LUCENE_ID).stringValue(); - String parentId = doc.getFieldable( - WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT).stringValue(); + String parentId = null; + Fieldable fieldable = doc.getFieldable(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); + if (fieldable != null) { + parentId = fieldable.stringValue(); + } int nb = counts.containsKey(id) ? counts.get(id) : 0; TreeNodeResult<String> child = new TreeNodeResult<String>(id, nb); allTreeNodeResult.put(id, child); - childParent.put(id, parentId); + childParent.put(id, parentId); } // construction de l'arbre avant de le retourner for(Map.Entry<String, TreeNodeResult<String>> e : allTreeNodeResult.entrySet()) {

1 0

r981 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortun＠users.nuiton.org June 28, 2011

June 28, 2011

Author: mfortun Date: 2011-06-28 14:34:17 +0200 (Tue, 28 Jun 2011) New Revision: 981 Url: http://nuiton.org/repositories/revision/wikitty/981 Log: * new tag for wikitty field * made preparation to allow developper to create custom wikitty tag Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,28 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class BooleanBean extends ClosingUIBean { + + public BooleanBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,40 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class FixedSelectBean extends ClosingUIBean { + + + protected String fixvalues; + + public FixedSelectBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,28 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class HiddenBean extends ClosingUIBean { + + public HiddenBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,28 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class TextAreaBean extends ClosingUIBean { + + public TextAreaBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,28 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class TextFieldBean extends ClosingUIBean { + + public TextFieldBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,48 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class WikittySelectBean extends ClosingUIBean { + + protected String criteria; + protected String descfield; + + public WikittySelectBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + // TODO mfortun + } + + public static final String OPEN_TEMPLATE = "ws-field"; + public static final String TEMPLATE = "ws-field-close"; + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String getDescfield() { + return descfield; + } + + public void setDescfield(String descfield) { + this.descfield = descfield; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-27 13:44:54 UTC (rev 980) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-28 12:34:17 UTC (rev 981) @@ -34,7 +34,8 @@ @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - + + if (action != null) { addParameter("action", findString(action)); } Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,25 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.BooleanBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class BooleanTag extends AbstractClosingTag { + + /** + * + */ + private static final long serialVersionUID = -6805631375278229185L; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new BooleanBean(stack, req, res); + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,36 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.FixedSelectBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class FixedSelectTag extends AbstractClosingTag{ + + /** + * + */ + private static final long serialVersionUID = -8415432856577152486L; + protected String fixvalues; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new FixedSelectBean(stack, req, res); + } + + + @Override + protected void populateParams() { + super.populateParams(); + FixedSelectBean fieldtag = ((FixedSelectBean) component); + + fieldtag.setFixvalues(fixvalues); + + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,24 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.HiddenBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class HiddenTag extends AbstractClosingTag { + /** + * + */ + private static final long serialVersionUID = -8489688376270657231L; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new HiddenBean(stack, req, res); + + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,24 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.TextAreaBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class TextAreaTag extends AbstractClosingTag{ + /** + * + */ + private static final long serialVersionUID = 1581493250527541122L; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new TextAreaBean(stack, req, res); + + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,23 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.TextFieldBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class TextFieldTag extends AbstractClosingTag { + /** + * + */ + private static final long serialVersionUID = 6266696595050454080L; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new TextFieldBean(stack, req, res); + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,57 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; + +import org.nuiton.wikitty.struts.component.WikittySelectBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class WikittySelectTag extends AbstractClosingTag { + + /** + * + */ + private static final long serialVersionUID = 2807198744532780915L; + protected String criteria; + protected String descfield; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new WikittySelectBean(stack, req, res); + + } + + + + @Override + protected void populateParams() { + super.populateParams(); + WikittySelectBean fieldtag = ((WikittySelectBean) component); + + fieldtag.setCriteria(criteria); + fieldtag.setDescfield(descfield); + } + + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String getDescfield() { + return descfield; + } + + public void setDescfield(String descfield) { + this.descfield = descfield; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1 @@ +<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> \ No newline at end of file Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1 @@ +${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> \ No newline at end of file Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1 @@ +${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > \ No newline at end of file Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-28 12:34:17 UTC (rev 981) @@ -0,0 +1,2 @@ +parameters + Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-27 13:44:54 UTC (rev 980) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-28 12:34:17 UTC (rev 981) @@ -72,7 +72,60 @@ <tag> - <name>field</name> + <name>wikittySelect</name> + <tagclass>org.nuiton.wikitty.struts.tag.WikittySelectTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description> + <name>criteria</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description> + <name>descfields</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + + <tag> + <name>fixedSelect</name> + <tagclass>org.nuiton.wikitty.struts.tag.FixedSelectTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> + <name>fixvalues</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + + <tag> + <name>wikittyField</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyFieldTag</tagclass> <bodycontent>empty</bodycontent> <description><![CDATA[Field to specialise how wikitty field will be presented]]></description> @@ -112,11 +165,73 @@ <name>descfields</name> <rtexprvalue>true</rtexprvalue> </attribute> + </tag> + <tag> + <name>hidden</name> + <tagclass>org.nuiton.wikitty.struts.tag.HiddenTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + </tag> + <tag> + <name>textField</name> + <tagclass>org.nuiton.wikitty.struts.tag.TextFieldTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> + <tag> + <name>textArea</name> + <tagclass>org.nuiton.wikitty.struts.tag.TextAreaTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + <tag> + <name>boolean</name> + <tagclass>org.nuiton.wikitty.struts.tag.BooleanTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + + </taglib>

1 0

r980 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component tld
by mfortun＠users.nuiton.org June 27, 2011

June 27, 2011

Author: mfortun Date: 2011-06-27 15:44:54 +0200 (Mon, 27 Jun 2011) New Revision: 980 Url: http://nuiton.org/repositories/revision/wikitty/980 Log: * add documentation for tag and attribute * correction for nullpointer inside wikitty field Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-27 10:42:43 UTC (rev 979) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-27 13:44:54 UTC (rev 980) @@ -10,10 +10,7 @@ @StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", description = "Renders an input form", allowDynamicAttributes = false) public class WikittyFieldTagBean extends ClosingUIBean { - protected FieldSpecialisation specialize; - - public WikittyFieldTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -36,9 +33,11 @@ super.evaluateExtraParams(); WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); - handler.specialiseField(specialize); - + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + handler.specialiseField(specialize); + } } public FieldSpecialisation getSpecialize() { @@ -49,6 +48,4 @@ this.specialize = specialize; } - - } Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-27 10:42:43 UTC (rev 979) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-27 13:44:54 UTC (rev 980) @@ -11,40 +11,59 @@ <tag> <name>wikitty</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyTag</tagclass> - + <description><![CDATA[Tag use to make a form to edit wikitty]]></description> <attribute> + <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> <attribute> + <description><![CDATA[the proxy from whom search for wikitty]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> <attribute> + <description><![CDATA[the url of the form action]]></description> <name>action</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[an url store as a hidden field of the form]]></description> <name>redirect</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[Type of the form: Form classic or pop-up form]]></description> <name>type</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[Field/extention that must appear in the form, if + defined other wikitty field will be ignored. + if not defined all wikitty field will be presented. + example: "wikittyPubData.name, wikittyLabel.*" + extentionName.* will include all field of extenstion]]></description> <name>include</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[wikitty field/extention that have to be ignore, even + if the field/extension is include if exclude it will + not be include in the form. + ]]></description> <name>exclude</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[Used to order wikitty field, those which are not ordered + will be added at the end.]]></description> <name>order</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[If a delele button must be in the form]]></description> <name>allowDelete</name> <rtexprvalue>true</rtexprvalue> </attribute> @@ -56,37 +75,46 @@ <name>field</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyFieldTag</tagclass> <bodycontent>empty</bodycontent> + <description><![CDATA[Field to specialise how wikitty field will be presented]]></description> <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> <name>name</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> <attribute> + <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <name>subtype</name> + <description><![CDATA[html type to present the field: hidden, textfield, textarea, boolean, file]]></description> + <name>type</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <name>type</name> + <description><![CDATA[the sub type if present a fixed list(see fixvalues) or if it will be wikitty found by the proxy]]></description> + <name>subtype</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <name>criteria</name> + <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> + <name>fixvalues</name> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> - <name>fixvalues</name> + <description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description> + <name>criteria</name> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description> <name>descfields</name> <rtexprvalue>true</rtexprvalue> </attribute> + + + </tag>

1 0

r979 - in trunk: . wikitty-struts wikitty-struts/src/main/java/org/nuiton/wikitty wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag
by mfortun＠users.nuiton.org June 27, 2011

June 27, 2011

Author: mfortun Date: 2011-06-27 12:42:43 +0200 (Mon, 27 Jun 2011) New Revision: 979 Url: http://nuiton.org/repositories/revision/wikitty/979 Log: * remove old version of wikitty tag * update dependency Removed: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/ Modified: trunk/pom.xml trunk/wikitty-struts/pom.xml trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/pom.xml 2011-06-27 10:42:43 UTC (rev 979) @@ -261,6 +261,13 @@ <version>${strutsxworksVersion}</version> </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspapiversion}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -452,7 +459,7 @@ <javassistVersion>3.8.0.GA</javassistVersion> <strutsxworksVersion>2.2.3</strutsxworksVersion> - + <jspapiversion>2.0</jspapiversion> </properties>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/pom.xml 2011-06-27 10:42:43 UTC (rev 979) @@ -27,7 +27,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>jsp-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 10:42:43 UTC (rev 979) @@ -14,8 +14,8 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.struts.component.ExtensionFieldStrutsBean.Option; + public class WikittyFieldHandler { protected Wikitty wikitty; @@ -152,12 +152,10 @@ Object valueObject = wikitty.getFieldAsObject( ext.getName(), fieldName); String valueString = ""; - String checkedNull = ""; + if (valueObject != null) { valueString = String.valueOf(valueObject); - } else { - checkedNull = "checked='true'"; - } + } temp.setValue(valueString); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-27 10:42:43 UTC (rev 979) @@ -2,7 +2,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.WikittyProxy;

1 0

r978 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/template/xhtml tld
by mfortun＠users.nuiton.org June 27, 2011

June 27, 2011

Author: mfortun Date: 2011-06-27 12:16:49 +0200 (Mon, 27 Jun 2011) New Revision: 978 Url: http://nuiton.org/repositories/revision/wikitty/978 Log: * wikittyfield handle now select element for wikitty value or fixed values Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-27 09:51:18 UTC (rev 977) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-27 10:16:49 UTC (rev 978) @@ -47,7 +47,14 @@ } + public void addOption(String val, String desc){ + Option opt= new Option(); + opt.setDescription(desc); + opt.setValeur(val); + this.listOption.add(opt); + } + public class Option { protected String valeur; @@ -64,12 +71,8 @@ public void setDescription(String description) { this.description = description; } - - public void addOption(Option opt){ - listOption.add(opt); - } + - } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 09:51:18 UTC (rev 977) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 10:16:49 UTC (rev 978) @@ -11,6 +11,10 @@ import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.struts.component.ExtensionFieldStrutsBean.Option; public class WikittyFieldHandler { @@ -19,10 +23,10 @@ protected String include = ""; protected String exclude = ""; protected String order = ""; - protected Map<String,FieldSpecialisation> field; + protected Map<String, FieldSpecialisation> field; public WikittyFieldHandler() { - field = new HashMap<String,FieldSpecialisation>(); + field = new HashMap<String, FieldSpecialisation>(); } public Wikitty getWikitty() { @@ -65,8 +69,6 @@ this.order = order; } - - public Map<String, FieldSpecialisation> getField() { return field; } @@ -76,7 +78,7 @@ } public void specialiseField(FieldSpecialisation fieldSpe) { - field.put(fieldSpe.getName(),fieldSpe); + field.put(fieldSpe.getName(), fieldSpe); } public Collection<ExtensionFieldStrutsBean> getWikittyField() { @@ -91,9 +93,7 @@ * included and excluded, it will not appear in the result */ - - - //delegate construction of map + // delegate construction of map Map<String, List<String>> excludeMap = constructIncludeExcludeMap(exclude); Map<String, List<String>> includeMap = constructIncludeExcludeMap(include); // if include is enable it change how to construct result @@ -134,6 +134,8 @@ temp.setLabel(temp.getName()); temp.setValue(""); + + // set the field type. switch (fieldType.getType()) { case BINARY: temp.setType("file"); @@ -175,33 +177,81 @@ } } - - for (Map.Entry<String, FieldSpecialisation> speEntry : field.entrySet()){ - ExtensionFieldStrutsBean obj = mapField.get(speEntry.getKey()); + /* + * specialize field. With name, label, type etc. + */ + for (Map.Entry<String, FieldSpecialisation> speEntry : field.entrySet()) { + ExtensionFieldStrutsBean fieldExtension = mapField.get(speEntry.getKey()); FieldSpecialisation spe = speEntry.getValue(); - if( obj != null){ - + if (fieldExtension != null) { + if (!"".equals(spe.getLabel())) { - obj.setLabel(spe.getLabel()); + fieldExtension.setLabel(spe.getLabel()); } - if (!"".equals(spe.getType())){ - obj.setType(spe.getType()); + if (!"".equals(spe.getType())) { + fieldExtension.setType(spe.getType()); } - - - + + // if fixed list of item is passed via fixvalues attribut + if ("fixed".equals(spe.getSubtype())) { + String[] valu = StringUtil.split(spe.getFixvalues(), ","); + for (String va : valu) { + fieldExtension.addOption(va, va); + } + + // if wikitty load all the options values + } else if ("wikitty".equals(spe.getSubtype())) { + PagedResult<Wikitty> wikitties = null; + + // check the criteria and request wikitty + if (!"".equals(spe.getCriteria())) { + + Criteria criteria = Search.query() + .keyword(spe.getCriteria()).criteria(); + wikitties = proxy.findAllByCriteria(criteria); + } + + String[] descriptor = StringUtil.split(spe.getDescfields(), + ","); + + if (wikitties != null) { + for (Wikitty wiki : wikitties) { + // by default value and description are the same + // wikitty id + String val = wiki.getId(); + + String desc = wiki.getId(); + + // if attribute descripteur fill with something + // extract from wikitty corresponding field value + if (descriptor.length != 0) { + desc = ""; + for (String descriptorIt : descriptor) { + String[] descTable = StringUtil.split( + descriptorIt, "."); + + desc += wiki.getFieldAsString(descTable[0], + descTable[1]); + + } + } + fieldExtension.addOption(val, desc); + } + + } + + } + } - + } - - - + String[] fieldOrder = StringUtil.split(order, ","); /* - * if an order is define parse order and construct ordering result - * if all the field are not defined in the order juste add the rest - * at the end of the result list. + * if an order is define parse order and construct ordering result if + * all the field are not defined in the order juste add the rest at the + * end of the result list. */ if (fieldOrder.length != 0) { @@ -217,30 +267,29 @@ orderedResult.addAll(mapField.values()); return orderedResult; } - + return mapField.values(); } - protected enum fieldTypeSpecialization{ - wikitty, - fixed; + protected enum fieldTypeSpecialization { + wikitty, fixed; } - /** * construct map for exclude or include template * - * @param entry the attribut of the wikitty field tag exemple include="machin.*, truc.bob, truc.tt" - * @return a map with key the string before the dot and a list with the value after the dot example: - * [machin:[*], truc:[tt,bob]] + * @param entry + * the attribut of the wikitty field tag exemple + * include="machin.*, truc.bob, truc.tt" + * @return a map with key the string before the dot and a list with the + * value after the dot example: [machin:[*], truc:[tt,bob]] */ - protected Map<String,List<String>> constructIncludeExcludeMap(String entry){ - - String [] entryTab = StringUtil.split(entry,","); - - - Map<String,List<String>> result= new HashMap<String, List<String>>(); - + protected Map<String, List<String>> constructIncludeExcludeMap(String entry) { + + String[] entryTab = StringUtil.split(entry, ","); + + Map<String, List<String>> result = new HashMap<String, List<String>>(); + // prepare list of excluded field and extension for (String excludeIt : entryTab) { String[] extfield = StringUtil.split(excludeIt, "."); @@ -259,5 +308,5 @@ } return result; } - + } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-27 09:51:18 UTC (rev 977) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-27 10:16:49 UTC (rev 978) @@ -26,7 +26,29 @@ </#if> /> </#if> +<#-- +--> +<#if aKey.type=="select" > +${aKey.label} : +<select name="${aKey.name}" size="1"> +<#assign optionKeys = aKey.listOption><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==aKey.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> + +</select> +</#if> + + + + + + </br> </#list><#t/> Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-27 09:51:18 UTC (rev 977) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-27 10:16:49 UTC (rev 978) @@ -59,6 +59,7 @@ <attribute> <name>name</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> <attribute> <name>label</name>

1 0

r977 - in trunk/wikitty-lucene/src: main/java/org/nuiton/wikitty/storage/lucene test/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 27, 2011

June 27, 2011

Author: echatellier Date: 2011-06-27 11:51:18 +0200 (Mon, 27 Jun 2011) New Revision: 977 Url: http://nuiton.org/repositories/revision/wikitty/977 Log: Improve tree nodes indexation. Added: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/AttachmentInTree.java trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/LuceneUtil.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittyLuceneConstants.java trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java Added: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/AttachmentInTree.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/AttachmentInTree.java (rev 0) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/AttachmentInTree.java 2011-06-27 09:51:18 UTC (rev 977) @@ -0,0 +1,218 @@ +/* + * #%L + * Wikitty :: wikitty-lucene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.lucene; + +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.LUCENE_ID; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.collections.Factory; +import org.apache.commons.collections.map.LazyMap; +import org.apache.lucene.document.Document; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; + +/** + * Class permettant de construire la liste des objets qui ont ete ajoute + * ou supprimer d'un noeud + * + * @author poussin + * @version $Revision$ + * @since 3.1 + * + * Last update: $Date$ + * by : $Author$ + */ +public class AttachmentInTree { + + // On genere en meme temps la liste des attachments qui doivent + // etre reindexe + protected Set<String> allAttachmentToIndex = new HashSet<String>(); + + protected Factory listFactory = new Factory() { + @Override + public Object create() { + return new HashSet<String>(); + } + }; + + // key: TreeNode id, value: list of attached id + protected Map<String, Set<String>> attachmentRemovedInTree = LazyMap.decorate( + new HashMap<String, Set<String>>(), listFactory); + // key: TreeNode id, value: list of attached id + protected Map<String, Set<String>> attachmentAddedInTree = LazyMap.decorate( + new HashMap<String, Set<String>>(), listFactory); + + /** + * Remove all ids in attachment list. Ids is object already deleted + * reindex it is not necessary + * + * @param ids + */ + public void clean(Collection<String> ids) { + if (ids != null) { + allAttachmentToIndex.removeAll(ids); + for (Set<String> set : attachmentRemovedInTree.values()) { + set.removeAll(ids); + } + for (Set<String> set : attachmentAddedInTree.values()) { + set.removeAll(ids); + } + } + } + + public int size() { + return allAttachmentToIndex.size(); + } + + public Set<String> getAll() { + return allAttachmentToIndex; + } + + public Map<String, Set<String>> getAdded() { + return attachmentAddedInTree; + } + + public Map<String, Set<String>> getRemoved() { + return attachmentRemovedInTree; + } + + /** + * @param id TreeNode id + * @param ids attachment id + */ + public void remove(String id, Collection<String> attId) { + if (attId != null && !attId.isEmpty()) { + attachmentRemovedInTree.get(id).addAll(attId); + allAttachmentToIndex.addAll(attId); + } + } + + /** + * @param doc TreeNode document representation + */ + public void remove(Document doc) { + //String id = SolrUtil.getStringFieldValue(doc, WikittySolrConstant.SOLR_ID); + String id = doc.get(LUCENE_ID); + + //Collection<String> att = SolrUtil.getStringFieldValues(doc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, + // TYPE.WIKITTY); + + String[] values = doc.getValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); + List<String> att = Arrays.asList(values); + remove(id, att); + } + + /** + * Ajout les attachment du TreeNode passe en parametre via son Id + * + * @param id TreeNode id + * @param attId attachment id + */ + public void add(String id, Collection<String> attId) { + if (attId != null && !attId.isEmpty()) { + attachmentAddedInTree.get(id).addAll(attId); + allAttachmentToIndex.addAll(attId); + } + } + + /** + * Ajout l'attachment du TreeNode passe en parametre via son Id + * + * @param id TreeNode id + * @param attId attachment id + * @since 3.0.5 + */ + public void add(String id, String attId) { + if (attId != null) { + attachmentAddedInTree.get(id).add(attId); + allAttachmentToIndex.add(attId); + } + } + + /** + * Ajout les attachment du TreeNode passe en parametre sous forme de doc Solr + * @param doc TreeNode document representation + */ + public void add(Document doc) { + //String id = SolrUtil.getStringFieldValue(doc, WikittySolrConstant.SOLR_ID); + String id = doc.get(LUCENE_ID); + + //Collection<String> att = SolrUtil.getStringFieldValues(doc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, + // TYPE.WIKITTY); + + String[] values = doc.getValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); + List<String> att = Arrays.asList(values); + add(id, att); + } + + /** + * Ajout les attachment du TreeNode passe en parametre sous forme de doc Solr + * Mais seulement si l'attachment est aussi dans la liste restriction + * + * @param doc TreeNode document representation + * @param restriction la liste accepte de wikitty a ajouter + * @since 3.0.5 + */ + public void add(Document doc, Set<String> restriction) { + //String id = SolrUtil.getStringFieldValue(doc, WikittySolrConstant.SOLR_ID); + String id = doc.get(LUCENE_ID); + + //Collection<String> att = SolrUtil.getStringFieldValues(doc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, + // TYPE.WIKITTY); + + String[] values = doc.getValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); + List<String> att = Arrays.asList(values); + if (att != null) { + for (String attId : att) { + if (restriction.contains(attId)) { + add(id, attId); + } + } + } + } + + /** + * Ajout les attachment du TreeNode passe en parametre sous forme de Wikitty + * @param doc TreeNode document representation + */ + public void add(Wikitty w) { + String id = w.getId(); + Set<String> att = WikittyTreeNodeHelper.getAttachment(w); + add(id, att); + } + +} Property changes on: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/AttachmentInTree.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/LuceneUtil.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/LuceneUtil.java (rev 0) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/LuceneUtil.java 2011-06-27 09:51:18 UTC (rev 977) @@ -0,0 +1,251 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.lucene; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Fieldable; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.search.operators.Element; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * @since 3.2 + */ +public class LuceneUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(LuceneUtil.class); + + /** + * Get field name used in lucene storage for a field name in query. + * + * @param fieldName field name to convert + * @return field name in lucene + */ + public static String getLuceneFieldName(String fieldName) { + String result; + if (Element.ELT_ID.equals(fieldName)) { + result = WikittyLuceneConstants.LUCENE_ID; + } else if (Element.ELT_EXTENSION.equals(fieldName)) { + result = WikittyLuceneConstants.LUCENE_EXTENSIONS; + } else { + result = fieldName; + } + return result; + } + + /** + * get value of field in Document, field must have only one value + * @param d + * @param fieldname + * @param type optional type to generate lucene field name + * @return + */ + static public Integer getIntFieldValue(Document d, String fieldname) { + String luceneFieldName = getLuceneFieldName(fieldname); + + Object value = d.getFieldable(luceneFieldName).stringValue(); + Integer result = convertToInteger(value, luceneFieldName); + return result; + } + + /** + * Converti un Object en String, si l'objet est de type String un simple + * cast est fait, si l'objet est un tableau, on prend le 1er element, si + * le tableau contient plus de 1 element une exception est levee + * + * @param value + * @param luceneFieldName + * @return une string ou null si value est null ou est un tableau vide + */ + static public String convertToString(Object value, String luceneFieldName) { + String result; + if (value == null) { + result = null; + } else if (value instanceof String) { + // c'est un champs monovalue + result = (String)value; + } else if (value instanceof String[]) { + // c'est un champs multivalue + String[] values = (String[])value; + if (values.length == 0) { + result = null; + } else if (values.length == 1) { + result = values[0]; + } else { + throw new WikittyException(String.format( + "You can't get one value from field (%s) with many (%s) value", + luceneFieldName, values.length)); + } + } else if (value instanceof Collection) { + Collection c = (Collection)value; + if (c.isEmpty()) { + result = null; + } else if (c.size() == 1){ + Object o = c.iterator().next(); + result = convertToString(o, luceneFieldName); + } else { + throw new WikittyException(String.format( + "You can't get one value from field (%s) with many (%s) value", + luceneFieldName, c.size())); + } + } else { + throw new WikittyException(String.format( + "Field (%s) is not an String but %s", + luceneFieldName, value.getClass().getName())); + } + return result; + } + + /** + * Converti un Object en String, si l'objet est de type String un simple + * cast est fait, si l'objet est un tableau, on prend le 1er element, si + * le tableau contient plus de 1 element une exception est levee + * + * @param value + * @param luceneFieldName + * @return une string ou null si value est null ou est un tableau vide + */ + static public Integer convertToInteger(Object value, String luceneFieldName) { + Integer result; + if (value == null) { + result = null; + } else if (value instanceof Integer) { + // c'est un champs monovalue + result = (Integer)value; + } else if (value instanceof Integer[]){ + // c'est un champs multivalue + Integer[] values = (Integer[])value; + if (values.length == 0) { + result = null; + } else if (values.length == 1) { + result = values[0]; + } else { + throw new WikittyException(String.format( + "You can't get one value from field (%s) with many (%s) value", + luceneFieldName, values.length)); + } + } else { + throw new WikittyException(String.format( + "Field (%s) is not an Integer but %s", + luceneFieldName, value.getClass().getName())); + } + return result; + } + + /** + * Copy lucene document + * + * @param source lucene document source + * @param dest lucene document destination + * @param fieldToInclude only copy this fields, if null or empty, copy all field + * @param fieldToExclude to not copy these fields + */ + static public void copyLuceneDocument(Document source, Document dest, + String[] fieldToInclude, String[] fieldToExclude) { + Collection<Fieldable> fields = source.getFields(); + Collection<String> fieldNames = new ArrayList<String>(); + for (Fieldable field : fields) { + fieldNames.add(field.name()); + } + + Set<String> fieldToCopy = new HashSet<String>(); + if (fieldToInclude == null || fieldToInclude.length == 0) { + fieldToCopy.addAll(fieldNames); + } else { + for (String fieldName : fieldNames) { + for (String fieldRegexp : fieldToInclude) { + if (fieldName.matches(fieldRegexp)) { + fieldToCopy.add(fieldName); + break; + } + } + } + } + + if (fieldToExclude != null && fieldToExclude.length > 0) { + for (String fieldName : fieldNames) { + for (String fieldRegexp : fieldToExclude) { + if (fieldName.matches(fieldRegexp)) { + fieldToCopy.remove(fieldName); + break; + } + } + } + } + + if (log.isDebugEnabled()) { + log.debug(String.format( + "Copiable field are %s but only field %s are copied", + fieldNames, fieldToCopy)); + } + + for (String fieldName : fieldToCopy) { + dest.removeField(fieldName); // to prevent add in already exist dest field + Fieldable[] scrFields = source.getFieldables(fieldName); + for (Fieldable scrField : scrFields) { + dest.add(scrField); + } + } + } + + /** + * Copy lucene document + * + * @param source lucene document source + * @param dest lucene document destination + * @param fieldToInclude only copy this field, if null or empty, copy all field + * @since 3.2 + */ + static public void copyLuceneDocument(Document source, Document dest, String... fieldToInclude) { + copyLuceneDocument(source, dest, fieldToInclude, null); + } + + /** + * Copy lucene document exlude some fields + * + * @param source lucene document source + * @param dest lucene document destination + * @param fieldToExclude not copy these fields + * @since 3.2 + */ + static public void copyLuceneDocumentExcludeSomeField(Document source, Document dest, String... fieldToExclude) { + copyLuceneDocument(source, dest, null, fieldToExclude); + } +} Property changes on: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/LuceneUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java 2011-06-24 16:06:02 UTC (rev 976) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java 2011-06-27 09:51:18 UTC (rev 977) @@ -34,6 +34,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.search.TermRangeQuery; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.search.operators.And; import org.nuiton.wikitty.search.operators.AssociatedRestriction; @@ -80,24 +81,6 @@ } /** - * Get field name used in lucene storage for a field name in query. - * - * @param fieldName field name to convert - * @return field name in lucene - */ - protected String getLuceneFieldName(String fieldName) { - String result; - if (Element.ELT_ID.equals(fieldName)) { - result = WikittyLuceneConstants.LUCENE_ID; - } else if (Element.ELT_EXTENSION.equals(fieldName)) { - result = WikittyLuceneConstants.LUCENE_EXTENSIONS; - } else { - result = fieldName; - } - return result; - } - - /** * Convert a wikitty restriction to lucene search query. * * @param restriction restriction to convert @@ -126,13 +109,13 @@ query = or2Lucene((Or)restriction); break; case EQUALS: - query = neq2Lucene((Equals)restriction); + query = eq2Lucene((Equals)restriction); break; case NOT_EQUALS: - query = less2Lucene((NotEquals)restriction); + query = neq2Lucene((NotEquals)restriction); break; case LESS: - query = lessEq2Lucene((Less)restriction); + query = less2Lucene((Less)restriction); break; case LESS_OR_EQUAL: query = lessEq2Lucene((LessOrEqual)restriction); @@ -189,7 +172,7 @@ protected String element2Lucene(Element element) { String result = element.getName(); //result = fieldModifer.convertToSolr(transaction, result); - result = getLuceneFieldName(result); + result = LuceneUtil.getLuceneFieldName(result); return result; } @@ -281,7 +264,12 @@ * @return */ protected Query between2Lucene(Between restriction) { - throw new NotImplementedException("Not yet implemented"); + String fieldName = element2Lucene(restriction.getElement()); + String min = restriction.getMin(); + String max = restriction.getMax(); + + TermRangeQuery query = new TermRangeQuery(fieldName, min, max, true, true); + return query; } /** @@ -312,27 +300,35 @@ * @param restriction * @return */ - protected Query lessEq2Lucene(Less restriction) { + protected Query less2Lucene(Less restriction) { throw new NotImplementedException("Not yet implemented"); } /** * @param restriction * @return + * @throws ParseException */ - protected Query less2Lucene(NotEquals restriction) { - throw new NotImplementedException("Not yet implemented"); + protected Query eq2Lucene(Equals restriction) throws ParseException { + String field = element2Lucene(restriction.getElement()); + Term term = new Term(field, restriction.getValue()); + TermQuery query = new TermQuery(term); + + return query; } /** * @param restriction * @return + * @throws ParseException */ - protected Query neq2Lucene(Equals restriction) { + protected Query neq2Lucene(NotEquals restriction) throws ParseException { String field = element2Lucene(restriction.getElement()); Term term = new Term(field, restriction.getValue()); TermQuery query = new TermQuery(term); - return query; + BooleanQuery bquery = new BooleanQuery(); + bquery.add(query, BooleanClause.Occur.MUST_NOT); + return bquery; } /** Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittyLuceneConstants.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittyLuceneConstants.java 2011-06-24 16:06:02 UTC (rev 976) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittyLuceneConstants.java 2011-06-27 09:51:18 UTC (rev 977) @@ -50,4 +50,22 @@ /** extensions field name in lucene */ static final public String LUCENE_DEFAULT_FIELD = WIKITTY_LUCENE_PREFIX + "fulltext"; + + /** Use for indexation tree node */ + static final public String TREENODE_PREFIX = WIKITTY_LUCENE_PREFIX + "tree."; + + /** Use as field on TreeNode */ + static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; + + /** Use as field on TreeNode, contains parent node id and himself node id */ + static final public String TREENODE_PARENTS = TREENODE_PREFIX + "parents"; + + /** Use as field on TreeNode, number of parents (root node depth=1) */ + static final public String TREENODE_DEPTH = TREENODE_PREFIX + "depth"; + + /** Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end */ + static final public String TREENODE_ATTACHED = TREENODE_PREFIX + "attached."; + + /** Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end used for facetisation */ + static final public String TREENODE_ATTACHED_ALL = TREENODE_PREFIX + "attached-all"; } Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-24 16:06:02 UTC (rev 976) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-27 09:51:18 UTC (rev 977) @@ -25,12 +25,26 @@ package org.nuiton.wikitty.storage.lucene; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.LUCENE_ID; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_ATTACHED; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_ATTACHED_ALL; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_DEPTH; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_PARENTS; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_PREFIX; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.TREENODE_ROOT; +import static org.nuiton.wikitty.storage.lucene.WikittyLuceneConstants.WIKITTY_LUCENE_PREFIX; + import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -45,23 +59,33 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; +import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.util.Version; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.TimeLog; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.services.WikittyTransaction; @@ -82,6 +106,7 @@ /** Class logger. */ final static private Log log = LogFactory.getLog(WikittySearchEngineLucene.class); + final static private TimeLog timeLog = new TimeLog(WikittySearchEngineLucene.class); /** Index directory. */ protected Directory indexDirectory; @@ -146,7 +171,7 @@ try { Class analyzerClass = config.getOptionAsClass(luceneAnalyzerFactoryKey); - + if (analyzerClass != null) { // get correct constructor Constructor constructor = analyzerClass.getConstructor(Version.class); @@ -200,7 +225,7 @@ /* * @see org.nuiton.wikitty.storage.WikittySearchEngine#store(org.nuiton.wikitty.services.WikittyTransaction, java.util.Collection, boolean) - */ + * @Override public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) throws WikittyException { @@ -230,27 +255,478 @@ } finally { IOUtils.closeQuietly(writer); } + }*/ + + /* + * @see org.nuiton.wikitty.storage.WikittySearchEngine#store(org.nuiton.wikitty.services.WikittyTransaction, java.util.Collection, boolean) + */ + @Override + public void store(WikittyTransaction transaction, + Collection<Wikitty> wikitties, boolean force) { + long startTime = TimeLog.getTime(); + + IndexWriter writer = null; + IndexSearcher searcher = null; + try { + // must be instancied every time (single instance per writer) + IndexWriterConfig indexWriterConfig = new IndexWriterConfig(WIKITTY_LUCENE_VERSION, indexAnalyzer); + writer = new IndexWriter(indexDirectory, indexWriterConfig); + searcher = new IndexSearcher(indexDirectory); + + // tous les wikitties passes en parametre + Map<String, Wikitty> allWikitties = new HashMap<String, Wikitty>(); + // les ids des wikitties en parametre reellement modifier (a reindexer) + Set<String> dirtyObject = new HashSet<String>(); + // les ids des TreeNodes dont le champs parent a change (est aussi + // contenu dans dirtyObject + Set<String> dirtyParent = new HashSet<String>(); + // les valeur du champs parent des TreeNodes dont le champs parent + // a change (sauf si parent = null) + Set<String> dirtyParentParentId = new HashSet<String>(); + + // doc that will be stored at end of process + Map<String, Document> addedDocs = new HashMap<String, Document>(); + + // remplissage des collections + for(Wikitty w : wikitties) { + allWikitties.put(w.getId(), w); + if (force || !w.getDirty().isEmpty() || + WikittyUtil.versionGreaterThan("1", w.getVersion())) { + // s'il y a au moins un champs a reindexer ou que l'objet + // n'a jamais ete sauve (1 > version) + dirtyObject.add(w.getId()); + if (WikittyTreeNodeHelper.hasExtension(w) && (force + ||w.getDirty().contains(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT) + || null == WikittyTreeNodeHelper.getParent(w))) { + // si le pere a change + // ou qu'il est null (creation d'un nouvel arbre) + // il faut indexer le noeud + dirtyParent.add(w.getId()); + String parent = WikittyTreeNodeHelper.getParent(w); + if (parent != null) { + dirtyParentParentId.add(parent); + } + } + } + } + + // recuperation des documents Solr deja indexes, pour minimiser la reindexation + Map<String, Document> dirtyObjectDoc = findAllById(searcher, dirtyObject); + Map<String, Document> dirtyParentDoc = findAllByField(searcher, TREENODE_PARENTS, dirtyParent); + Map<String, Document> parents = findAllById(searcher, dirtyParentParentId); + + // On genere en meme temps la liste des attachments qui doivent + // etre reindexe + AttachmentInTree attachmentInTree = new AttachmentInTree(); + + // + // Phase 1: on indexe les objets passe en paremetre, on copie si + // besoin #tree.attached des wikitties et #tree.* des + // TreeNode dont leur champs parent n'a pas ete modifie, et + // dans ce cas on collecte les modif d'attachments des TreeNode + // + + for (String id : dirtyObject) { + Wikitty w = allWikitties.get(id); + Document oldDoc = dirtyObjectDoc.get(id); + Document doc = convertWikittyToDoc(w); + if (oldDoc != null) { + // On a un ancien document partiel ou complet + // s'il etait partiel (seulement l'indexation arbre + // cela veut dire que l'objet TreeNode a ete store + // sans que l'attachment le soit et qu'il l'est que + // maintenant + + // copy des champs #tree.attached des documents partiels ou non + LuceneUtil.copyLuceneDocument(oldDoc, doc, TREENODE_ATTACHED + ".*"); + if (WikittyTreeNodeHelper.hasExtension(w) + && !dirtyParentDoc.containsKey(id)) { + // si c'est un TreeNode, mais qu'aucun pere n'a change + // on recopie l'ancienne indexation d'arbre + // si elle existe + LuceneUtil.copyLuceneDocument(oldDoc, doc, TREENODE_PREFIX + ".*"); + + // il faut verifier les objets attaches + // attaches ajoute/supprime + // on ne traite ici que les TreeNode sans modif d'indexation + // pour les autres les attachments seront traites dans + // la phase suivante + Set<String> newAtt = WikittyTreeNodeHelper.getAttachment(w); + + //Collection<String> oldAtt = SolrUtil.getStringFieldValues( + // oldDoc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, + // TYPE.WIKITTY); + String[] values = oldDoc.getValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); + Collection<String> oldAtt = Arrays.asList(values); + + // il faut supprimer l'indexation arbre des noeuds + // qui sont dans old, mais pas dans new + Set<String> toRemove = new HashSet<String>(); + if (oldAtt != null) { + toRemove.addAll(oldAtt); + } + if (newAtt != null) { + toRemove.removeAll(newAtt); + } + attachmentInTree.remove(id, toRemove); + // il faut ajouter l'indexation arbre des noeuds + // qui sont dans new, mais pas dans old + Set<String> toAdd = new HashSet<String>(); + if (newAtt != null) { + toAdd.addAll(newAtt); + } + if (oldAtt != null) { + toAdd.removeAll(oldAtt); + } + attachmentInTree.add(id, toAdd); + } + } + addedDocs.put(doc.get(LUCENE_ID), doc); + } + + // + // Phase 2: on reindexe tous les TreeNode qui en ont besoin + // nouveau TreeNode ou TreeNode ayant un parent modifie + // + + // on ajoute tous les TreeNode qui doivent aussi etre reindexe + // noeud du sous arbre d'un noeud dont le pere a ete modifie + dirtyParent.addAll(dirtyParentDoc.keySet()); + + for (String id : dirtyParent) { + // w et oldDoc peuvent etre null, mais pas en meme temps + // w est null si c'est un noeud dont la reindexation est force + // parce que un de ces peres a change de parent + // oldDoc est null, si l'objet n'a jamais ete indexe (nouveau) + Wikitty w = allWikitties.get(id); + Document oldDoc = dirtyParentDoc.get(id); + Document doc = addedDocs.get(id); + if (w == null) { + // on reindexe un ancien objet + // normalement doc doit etre null + doc = new Document(); + // on recopie tous les champs, sauf l'indexation arbre + LuceneUtil.copyLuceneDocumentExcludeSomeField( + oldDoc, doc, TREENODE_PREFIX + ".*"); + + // modifie les champs root, parents + addTreeIndexField(addedDocs, doc, parents); + + attachmentInTree.remove(oldDoc); + attachmentInTree.add(oldDoc); + } else if (oldDoc == null) { + // ajoute les champs root, parents + addTreeIndexField(addedDocs, doc, parents); + + // on indexe un nouvel objet, il faut ajouter tous les + // attachment pour indexation + attachmentInTree.add(w); + } else { + // ni w, ni oldDoc ne sont pas null, c'est une modification + // dans la phase precendente on a deja indexe les champs + // normaux + + // ajoute les champs root, parents + addTreeIndexField(addedDocs, doc, parents); + + // il faut supprimer tous les anciens attaches + // et ajouter tous nouveaux pour la reindexation + attachmentInTree.remove(oldDoc); + attachmentInTree.add(w); + } + //solrResource.addDoc(id, doc); + addedDocs.put(doc.get(LUCENE_ID), doc); + } + + // + // Phase 3: on reindexe les attachments qui en ont besoin + // + + addTreeIndexField(writer, searcher, addedDocs, null, attachmentInTree); + + // on ne peut faire le add reel qu'à ce moment + // car les meme doc sont ajouter plusieurs fois dans la map + for (Document doc : addedDocs.values()) { + writer.addDocument(doc); + } + writer.commit(); + } catch (Exception eee) { + throw new WikittyException("Can't store wikitty", eee); + } finally { + IOUtils.closeQuietly(writer); + IOUtils.closeQuietly(searcher); + } + timeLog.log(startTime, "store", String.format( + "nb %s in force mode %s", wikitties.size(), force)); } + + /** + * Modifie/Ajoute les champs specifique a l'indexation des arbres sur les + * TreeNode. + * + * On se base sur le fait que si un TreeNode est dans {@link SolrResource} il ne + * peut etre que dans deux etats. Soit il a ete reindexe pour les arbres + * et il a les champs d'indexation arbre. Soit il a pas encore ete reindexe + * pour les arbres et dans ce cas il ne doit pas avoir les champs d'indexation + * d'arbre. (il est donc interdit d'avoir des champs d'indexation arbre + * obsolete si le document est dans {@link SolrResource}) + * + * @param solrResource solR resource + * @param doc les documents representant le TreeNode + * @param tree tous les autres noeuds d'arbre dont on pourrait avoir + * besoin pour l'indexation + */ + protected void addTreeIndexField(Map<String, Document> addedDocs, Document doc, Map<String, Document> tree) { + Set<String> parents = new HashSet<String>(); + String root = null; + String treeNodeId = doc.get(LUCENE_ID); + String parentId = treeNodeId; + if (parentId == null) { + throw new WikittyException("parentId is null, but this must be impossible"); + } + parents.add(parentId); + while (root == null) { + String nextParentId = null; + Document parentDoc = addedDocs.get(parentId); + if (parentDoc != null) { + // si parentDoc a deja ete indexe pour l'arbre, on peut reutiliser + // directement les valeurs et sortir de la boucle + if (parentDoc.get(TREENODE_ROOT) != null) { + root = parentDoc.get(TREENODE_ROOT); + //Collection<String> p = SolrUtil.getStringFieldValues(parentDoc, TREENODE_PARENTS); + String[] values = parentDoc.getValues(TREENODE_PARENTS); + Collection<String> p = Arrays.asList(values); + parents.addAll(p); + break; + } else { + //nextParentId = SolrUtil.getStringFieldValue(parentDoc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, + // TYPE.WIKITTY); + nextParentId = parentDoc.get( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); + } + } else { + Document oldParentDoc = tree.get(parentId); + if (oldParentDoc != null) { + // si parentDoc a deja ete indexe pour l'arbre, on peut reutiliser + // directement les valeurs et sortir de la boucle + if (oldParentDoc.get(TREENODE_ROOT) != null) { + //root = SolrUtil.getStringFieldValue(oldParentDoc,TREENODE_ROOT); + root = oldParentDoc.get(TREENODE_ROOT); + //Collection<String> p = SolrUtil.getStringFieldValues(oldParentDoc, TREENODE_PARENTS); + String[] values = oldParentDoc.getValues(TREENODE_PARENTS); + Collection<String> p = Arrays.asList(values); + parents.addAll(p); + break; + } else { + //nextParentId = SolrUtil.getStringFieldValue(oldParentDoc, + // WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, + // TYPE.WIKITTY); + nextParentId = oldParentDoc.get(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); + } + } + } + if (nextParentId != null) { + if (parents.contains(nextParentId)) { + log.error(String.format("Tree with TreeNode '%s' have loop" + + " at node %s->%s all parents are %s. Set root with" + + " last valide parent '%s'", + treeNodeId, parentId, nextParentId, parents, parentId)); + root = parentId; + } else { + parents.add(nextParentId); + parentId = nextParentId; + } + } else { + root = parentId; + } + } + doc.removeField(TREENODE_ROOT); + doc.removeField(TREENODE_PARENTS); + doc.removeField(TREENODE_DEPTH); + + /*doc.addField(TREENODE_ROOT, root); + doc.addField(TREENODE_DEPTH, parents.size()); + for (String id : parents) { + doc.addField(TREENODE_PARENTS, id); + }*/ + doc.add(new Field(TREENODE_ROOT, root, Store.YES, Index.NOT_ANALYZED)); + doc.add(new Field(TREENODE_DEPTH, String.valueOf(parents.size()), Store.YES, Index.NOT_ANALYZED)); + for (String id : parents) { + doc.add(new Field(TREENODE_PARENTS, id, Store.YES, Index.NOT_ANALYZED)); + } + } + /** + * Update attached extra field on all objects passed in argument + * allAttachmentToIndex + * + * @param solrResource must contains reindexed TreeNode, that contains attachment + * @param tree solr document for some TreeNode (used when TreeNode not find in solrResource) + * @param attachmentInTree attachment added and removed from TreeNode + * @throws IOException + */ + protected void addTreeIndexField(IndexWriter indexWriter, IndexSearcher indexSearcher, Map<String, Document> addedDocs, + Map<String, Document> tree, AttachmentInTree attachmentInTree) throws IOException { + + if (attachmentInTree.size() > 0) { + Map<String, Document> attachments = findAllById(indexSearcher, attachmentInTree.getAll()); + + for (String treeNodeId : attachmentInTree.getRemoved().keySet()) { + for (String attId : attachmentInTree.getRemoved().get(treeNodeId)) { + Document oldDoc = attachments.get(attId); + Document doc = addedDocs.get(attId); + if (oldDoc != null || doc != null) { + if (doc == null) { + doc = new Document(); + LuceneUtil.copyLuceneDocument(oldDoc, doc); + addedDocs.put(attId, doc); + } + doc.removeField(TREENODE_ATTACHED + treeNodeId); + } + } + } + for (String treeNodeId : attachmentInTree.getAdded().keySet()) { + Collection<String> treeNodeParents = null; + Document treeNodeDoc = addedDocs.get(treeNodeId); + if (treeNodeDoc != null) { + //treeNodeParents = SolrUtil.getStringFieldValues( + // treeNodeDoc, TREENODE_PARENTS); + String[] treeNodeParent = treeNodeDoc.getValues(TREENODE_PARENTS); + treeNodeParents = Arrays.asList(treeNodeParent); + } else if (tree != null) { + Document doc = tree.get(treeNodeId); + //treeNodeParents = SolrUtil.getStringFieldValues( + // doc, TREENODE_PARENTS); + String[] treeNodeParent = doc.getValues(TREENODE_PARENTS); + treeNodeParents = Arrays.asList(treeNodeParent); + } else { + log.error("SolR doc not found in Transaction or in tree." + + "This is a bug !!!"); + } + // add tree indexation on all attachments for this treeNodeId + for (String attId : attachmentInTree.getAdded().get(treeNodeId)) { + Document oldDoc = attachments.get(attId); + Document doc = addedDocs.get(attId); + // il faut que oldDoc ou doc soit different de null pour + // pouvoir ajouter l'indexation d'arbre. Le cas on les deux + // sont nuls arrivent lorsqu'on demande la sauvegarde d'un + // TreeNode alors qu'on a pas encore sauve les attachments + // (ex: durant un syncSearchEngine ou l'on demande une + // reindexation totale). Ceci n'est pas un probleme car + // les attachments seront convenablement indexes lorsqu'ils + // seront ajoutes + if (oldDoc == null && doc == null) { + // L'objet en attachment du TreeNode, n'est pas encore + // store et n'est pas dans le meme appel de la methode + // store. On cree donc un document Partiel (seulement + // constitue de l'id et de l'indexation d'arbre qui sera + // reutilise lors du store de reel objet + doc = new Document(); + addToIndexDocument(doc, null, LUCENE_ID, attId, true); + } else if (doc == null) { + doc = new Document(); + LuceneUtil.copyLuceneDocument(oldDoc, doc); + //solrResource.addDoc(attId, doc); + addedDocs.put(attId, doc); + } + doc.removeField(TREENODE_ATTACHED + treeNodeId); + for (String id : treeNodeParents) { + //doc.addField(TREENODE_ATTACHED + treeNodeId, id); + doc.add(new Field(TREENODE_ATTACHED + treeNodeId, id, Store.YES, Index.NOT_ANALYZED)); + } + } + } + } + } + + /** + * Ajoute un champs dans un document a indexer + */ + protected void addToIndexDocument(Document doc, + TYPE type, String fqfieldName, String fieldValue, + boolean collection) { + if (fqfieldName.startsWith(WIKITTY_LUCENE_PREFIX)) { + doc.removeField(fqfieldName); + //doc.addField(fqfieldName, fieldValue); + doc.add(new Field(fqfieldName, fieldValue, Store.YES, Index.NOT_ANALYZED)); + } else { + String solrFqFieldName; + /* +// FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field +// if (collection) { +// solrFqFieldName = SolrUtil.getSolrCollectionFieldName(fqfieldName, type); +// } else { + // add suffix like _s for string type ex: myExt.myField_s + solrFqFieldName = SolrUtil.getSolrFieldName(fqfieldName, type); +// } + + // #all.<fieldname> + // permet de faire des recherches inter extension sur un champs ayant + // le meme nom. ex:Person.name et User.name + // Quoi qu'il arrive pour le #all on utilise du multivalue +// FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field +// String solrAllFqFieldName = SolrUtil.getSolrCollectionFieldName(fqfieldName, type); + String solrAllFieldName = SOLR_ALL_EXTENSIONS + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + WikittyUtil.getFieldNameFromFQFieldName(solrFqFieldName); + + // idem mais un champs sur plusieurs extension peut avoir des types + // different, on ajoute donc un champs pour la recherche fulltext + String solrFulltextAllFieldName = SOLR_FULLTEXT_ALL_EXTENSIONS + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + WikittyUtil.getFieldNameFromFQFieldName(fqfieldName); + + String solrNullFieldFqFieldName = SOLR_NULL_FIELD + fqfieldName; + + // sortable solr field name for this field ex: myExt.myField_s_sortable + String solrFqFieldNameSortable = solrFqFieldName + SUFFIX_SORTABLE; + + doc.remove(solrFqFieldName); // myExt.myField_s + doc.remove(solrNullFieldFqFieldName); // #null_field-myExt.myField + doc.remove(solrAllFieldName); // #all.myField_s + doc.remove(solrFulltextAllFieldName); // #fulltext.all.myField + doc.remove(solrFqFieldNameSortable); // myExt.myField_s_sortable + + String solrNullFieldFqFieldNameValue = "true"; + if(fieldValue != null) { + doc.addField(solrFqFieldName, fieldValue); + doc.addField(solrAllFieldName, fieldValue); + doc.addField(solrFulltextAllFieldName, fieldValue); + Object oneFieldValue = SolrUtil.getOneValue(fieldValue); + doc.addField(solrFqFieldNameSortable, oneFieldValue); + solrNullFieldFqFieldNameValue = "false"; + if (log.isTraceEnabled()) { + log.trace(String.format("index field '%s' with value '%s'", + solrFqFieldName, + StringUtils.abbreviate(String.valueOf(fieldValue), 50))); + } + } + doc.addField(solrNullFieldFqFieldName, solrNullFieldFqFieldNameValue);*/ + } + } + + /** * Convert a wikitty object to a lucene {@link Document}. * * @param w wikitty to convert * @return lucene document */ protected Document convertWikittyToDoc(Wikitty w) { - + Document document = new Document(); - + // wikitty id Field luceneIdField = new Field(WikittyLuceneConstants.LUCENE_ID, w.getId(), - Store.YES, Index.ANALYZED); + Store.YES, Index.NOT_ANALYZED); document.add(luceneIdField); - + // wikitty extension String extAsString = StringUtils.join(w.getExtensionNames(), ","); Field luceneExtField = new Field(WikittyLuceneConstants.LUCENE_EXTENSIONS, - extAsString, Store.YES, Index.ANALYZED); + extAsString, Store.YES, Index.NOT_ANALYZED); document.add(luceneExtField); StringBuffer allAsText = new StringBuffer(); @@ -258,19 +734,35 @@ for (String wikyttyField : w.getAllFieldNames()) { String ext = WikittyUtil.getExtensionNameFromFQFieldName(wikyttyField); String fieldName = WikittyUtil.getFieldNameFromFQFieldName(wikyttyField); - String value = w.getFieldAsString(ext, fieldName); - if (StringUtils.isNotEmpty(value)) { - if (log.isTraceEnabled()) { - log.trace("add lucene field : " + wikyttyField + " = " + value); + if (w.getFieldType(wikyttyField).isCollection()) { + List<String> values = w.getFieldAsList(ext, fieldName, String.class); + // Store.YES = mandatory for facets + // Index.NOT_ANALYZED = mandatory for search on field + if (values != null) { + for (String value : values) { + Field luceneField = new Field(wikyttyField, value, Store.YES, Index.NOT_ANALYZED); + document.add(luceneField); + + // copy content to #fulltext field + allAsText.append(value); + } } - - // Store.YES = mandatory for facets - // Index.ANALYZED = mandatory for search on field - Field luceneField = new Field(wikyttyField, value, Store.YES, Index.ANALYZED); - document.add(luceneField); - - allAsText.append(value); + } else { + String value = w.getFieldAsString(ext, fieldName); + if (StringUtils.isNotEmpty(value)) { + if (log.isTraceEnabled()) { + log.trace("add lucene field : " + wikyttyField + " = " + value); + } + + // Store.YES = mandatory for facets + // Index.ANALYZED = mandatory for search on field + Field luceneField = new Field(wikyttyField, value, Store.YES, Index.NOT_ANALYZED); + document.add(luceneField); + + // copy content to #fulltext field + allAsText.append(value); + } } } @@ -299,6 +791,9 @@ for (String id : idList) { Term term = new Term(WikittyLuceneConstants.LUCENE_ID, id); + if (log.isDebugEnabled()) { + log.debug("Delete with query : " + term); + } writer.deleteDocuments(term); } @@ -415,6 +910,78 @@ return pagedResult; } + /** + * Look for a lucene document by id. + * + * @param indexSearcher index searcher + * @param id id to find + * @return found document + * @throws IOException + */ + protected Document findById(IndexSearcher indexSearcher, String id) throws IOException { + return findByField(indexSearcher, LUCENE_ID, id); + } + + /** + * Look for a lucene document by id. + * + * @param indexSearcher index searcher + * @param fieldName field name to search into + * @param fieldValue field value to find + * @return found document + * @throws IOException + */ + protected Document findByField(IndexSearcher indexSearcher, String fieldName, String fieldValue) throws IOException { + Term term = new Term(fieldName, fieldValue); + TermQuery termQuery = new TermQuery(term); + TopDocs topDocs = indexSearcher.search(termQuery, null, 1); + Document result = null; + if (topDocs.totalHits == 1) { + int docId = topDocs.scoreDocs[0].doc; + result = indexSearcher.doc(docId); + } + return result; + } + + /** + * Look for a lucene document by id. + * + * @param indexSearcher index searcher + * @param id id to find + * @return found document + * @throws IOException + */ + protected Map<String, Document> findAllById(IndexSearcher indexSearcher, Collection<String> ids) throws IOException { + return findAllByField(indexSearcher, LUCENE_ID, ids); + } + + /** + * Look for a lucene document by id. + * + * @param indexSearcher index searcher + * @param fieldName field name to search into + * @param fieldValues field values to find + * @return found document + * @throws IOException + */ + protected Map<String, Document> findAllByField(IndexSearcher indexSearcher, String fieldName, Collection<String> fieldValues) throws IOException { + BooleanQuery query = new BooleanQuery(); + for (String fieldValue : fieldValues) { + Term term = new Term(fieldName, fieldValue); + TermQuery termQuery = new TermQuery(term); + query.add(termQuery, BooleanClause.Occur.SHOULD); + } + TopDocs topDocs = indexSearcher.search(query, null, 1000); + Map<String, Document> result = new HashMap<String, Document>(); + for (ScoreDoc socreDoc : topDocs.scoreDocs) { + int docId = socreDoc.doc; + Document doc = indexSearcher.doc(docId); + String wikittyId = doc.getFieldable(LUCENE_ID).stringValue(); + result.put(wikittyId, doc); + } + return result; + } + /* * @see org.nuiton.wikitty.storage.WikittySearchEngine#findAllChildrenCount(org.nuiton.wikitty.services.WikittyTransaction, java.lang.String, int, boolean, org.nuiton.wikitty.search.Criteria) */ @@ -423,7 +990,98 @@ WikittyTransaction transaction, String wikittyId, int depth, boolean count, Criteria filter) { - return null; + TreeNodeResult<String> result = null; + IndexSearcher searcher = null; + try { + searcher = new IndexSearcher(indexDirectory); + + Document luceneDoc = findById(searcher, wikittyId); + if (luceneDoc != null) { + + // on verifie que l'argument est bien un TreeNode + if (luceneDoc.getFieldable(TREENODE_DEPTH) != null) { + Search treeSearch = Search.query().and().eq(TREENODE_PARENTS, wikittyId); + if (depth >= 0) { + //Integer d = LuceneUtil.getIntFieldValue(luceneDoc, TREENODE_DEPTH); + String sField = luceneDoc.get(TREENODE_DEPTH); + Integer d = Integer.parseInt(sField); + treeSearch = treeSearch.bw(TREENODE_DEPTH, + String.valueOf(d), String.valueOf(d + depth)); + } + Criteria treeCriteria = treeSearch.criteria(); + + // on a dans treeSearch uniquement le noeud passe en parametre + // et ses enfants jusqu'a la profondeur demandee + Restriction2Lucene restriction2Lucene = + new Restriction2Lucene(indexAnalyzer); + Query query = restriction2Lucene.toLucene(treeCriteria.getRestriction()); + TopDocs topDocs = searcher.search(query, null, 1000); + //SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); + //QueryResponse resp = SolrUtil.executeQuery(solrServer, query); + //SolrDocumentList solrResults = resp.getResults(); + + // recuperation si demande du nombre d'attachment par noeud + Map<String, Integer> counts = new HashMap<String, Integer>(); + if (count) { + // TODO poussin 20110128 regarder si on ne peut pas + // restreindre les facettes aux noeuds trouve dans la recherche + // precedente + Criteria attCriteria = Search.query(filter).eq( + TREENODE_ATTACHED_ALL, wikittyId).criteria() + .setFirstIndex(0).setEndIndex(0) + .addFacetField(TREENODE_ATTACHED_ALL); + PagedResult<String> attSearch = + findAllByCriteria(transaction, attCriteria); + List<FacetTopic> topics = attSearch.getTopic(TREENODE_ATTACHED_ALL); + if (topics != null) { + for (FacetTopic topic : topics) { + String topicName = topic.getTopicName(); + int topicCount = topic.getCount(); + counts.put(topicName, topicCount); + } + } + } + + // construction du resultat, il proceder en 2 phases car + // sinon si on construit un fils avant son pere, il ne sera + // jamais associe + Map<String, TreeNodeResult<String>> allTreeNodeResult = + new HashMap<String, TreeNodeResult<String>>(); + // key: id de l'enfant, value: l'id du parent + Map<String, String> childParent = new HashMap<String, String>(); + // construction de tous les TreeNodeResult qui permettront + // de construire l'arbre + for (ScoreDoc scoreDoc : topDocs.scoreDocs) { + Document doc = searcher.doc(scoreDoc.doc); + String id = doc.getFieldable(LUCENE_ID).stringValue(); + + String parentId = doc.getFieldable( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT).stringValue(); + int nb = counts.containsKey(id) ? counts.get(id) : 0; + TreeNodeResult<String> child = new TreeNodeResult<String>(id, nb); + allTreeNodeResult.put(id, child); + childParent.put(id, parentId); + } + // construction de l'arbre avant de le retourner + for(Map.Entry<String, TreeNodeResult<String>> e : allTreeNodeResult.entrySet()) { + String id = e.getKey(); + String parentId = childParent.get(id); + if (allTreeNodeResult.containsKey(parentId)) { + TreeNodeResult<String> child = e.getValue(); + TreeNodeResult<String> parent = allTreeNodeResult.get(parentId); + if (parent != child) { + parent.add(child); + } + } + } + result = allTreeNodeResult.get(wikittyId); + } + } + } catch (IOException ex) { + throw new WikittyException("Can't search on index", ex); + } finally { + IOUtils.closeQuietly(searcher); + } + return result; } - } Modified: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java =================================================================== --- trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2011-06-24 16:06:02 UTC (rev 976) +++ trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2011-06-27 09:51:18 UTC (rev 977) @@ -73,7 +73,7 @@ protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - protected WikittyProxy proxy = new WikittyProxy(ws); + protected static WikittyProxy proxy; @BeforeClass public static void initTests() throws Exception { @@ -83,6 +83,7 @@ instance.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.key, indexDir.getAbsolutePath()); ws = new WikittyServiceLucene(instance); + proxy= new WikittyProxy(ws); } @Before @@ -375,4 +376,20 @@ Collections.singletonList(query.criteria())).get(0).getNumFound()); Assert.assertEquals(0, proxy.findAllByCriteria(WikittyLabel.class, query.criteria()).size()); } + + /** + * Test to store duplicated wikitty. + */ + @Test + public void testLuceneDoubleStore() { + WikittyLabel myLabel1 = new WikittyLabelImpl(); + + proxy.store(myLabel1); + proxy.store(myLabel1); + + Criteria criteria = Search.query().exteq(WikittyLabel.EXT_WIKITTYLABEL).criteria(); + criteria.setEndIndex(0); // just count + PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); + Assert.assertEquals(1, result.getNumFound()); + } }

1 0