Changeset 15063

Timestamp:

03/06/10 14:20:46 (2 years ago)

Author:

sys

Message:

Exp de recherche : ItemSgnRegexp

Location:

trunk/Jav_Wsp/src/com/scenari/wsp/src/search

Files:

• ItemSgnRegexpExecExp.java (added)
• ItemSrcTypeExecExp.java (modified) (3 diffs)
• SearchExecutorWsp.java (modified) (2 diffs)
• exp/ItemSgnRegexp.java (added)

trunk/Jav_Wsp/src/com/scenari/wsp/src/search/ItemSrcTypeExecExp.java

@@ -65 +65 @@
          * Iterator qui filtre selon une recherche full-text dans l'item.
          */
-        public class FullTextFilterIt extends PredicateFilterIterator<ISearchResultRowInternal> implements Predicate<ISearchResultRowInternal> {
+        public class SrcTypesFilterIt extends PredicateFilterIterator<ISearchResultRowInternal> implements Predicate<ISearchResultRowInternal> {
 
                 protected boolean fResultAttempted;
@@ -71 +71 @@
                 protected int fSrcTypesValue;
 
-                public FullTextFilterIt(Iterator<ISearchResultRowInternal> pFrom, int pSrcTypes, boolean pResultAttempted) {
+                public SrcTypesFilterIt(Iterator<ISearchResultRowInternal> pFrom, int pSrcTypes, boolean pResultAttempted) {
                         super(pFrom);
                         fResultAttempted = pResultAttempted;
@@ -146 +146 @@
         public Iterator<ISearchResultRowInternal> match(Iterator<ISearchResultRowInternal> pUris, ISearchContextInternal pContext) throws Exception {
                 int vSrcTypes = getInt(fSrcTypes.evaluate(pContext));
-                return new FullTextFilterIt(pUris, vSrcTypes, matchValue()).setPredicateAsSelf();
+                return new SrcTypesFilterIt(pUris, vSrcTypes, matchValue()).setPredicateAsSelf();
         }
 

trunk/Jav_Wsp/src/com/scenari/wsp/src/search/SearchExecutorWsp.java

@@ -49 +49 @@
 import com.scenari.src.search.exp.LinkParents;
 import com.scenari.src.search.exp.LinkParentsOutOfFolder;
+import com.scenari.wsp.src.search.exp.ItemSgnRegexp;
 import com.scenari.wsp.src.search.exp.ItemSrcType;
 
@@ -85 +86 @@
                 Class vClass = pExp.getClass();
                 if (vClass == ItemSrcType.class) return new ItemSrcTypeExecExp(this).init((ItemSrcType) pExp, pMakeContext);
+                if (vClass == ItemSgnRegexp.class) return new ItemSgnRegexpExecExp(this).init((ItemSgnRegexp) pExp, pMakeContext);
                 if (vClass == FullText.class) return new FullTextExecExp(this).init((FullText) pExp, pMakeContext);
                 if (vClass == LinkDesc.class) return new LinkDescExecExp(this).init((LinkDesc) pExp, pMakeContext);