You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2011/02/16 13:53:32 UTC
svn commit: r1071235 -
/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/
Author: rwesten
Date: Wed Feb 16 12:53:32 2011
New Revision: 1071235
URL: http://svn.apache.org/viewvc?rev=1071235&view=rev
Log:
2nd attempt to changed the package "constraintEncoders" to its lower case version - seams not so easy on a file system that does not allow multiple files/directories that only differ in lower/upper case letters ...
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/AssignmentEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/DataTypeEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/FieldEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GeEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GtEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LangEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LeEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LtEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/RegexEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/WildcardEncoder.java
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/AssignmentEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/AssignmentEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/AssignmentEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/AssignmentEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/DataTypeEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/DataTypeEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/DataTypeEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/DataTypeEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/FieldEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/FieldEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/FieldEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/FieldEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Collection;
import java.util.Collections;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GeEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GeEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GeEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GeEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GtEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GtEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GtEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/GtEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LangEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LangEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LangEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LangEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
@@ -34,7 +34,9 @@ public class LangEncoder implements Inde
private static final ConstraintTypePosition PREFIX = new ConstraintTypePosition(PositionType.prefix);
private static final ConstraintTypePosition SUFFIX = new ConstraintTypePosition(PositionType.suffux);
- private static final IndexDataType STRING_DATATYPE = new IndexDataType(NamespaceEnum.xsd+"string");
+ //deactivated, because xsd:string values are now also included in the language
+ //merger field (the name returned by fieldMapper.getLanguageMergerField(null)).
+ //private static final IndexDataType STRING_DATATYPE = new IndexDataType(NamespaceEnum.xsd+"string");
private FieldMapper fieldMapper;
public LangEncoder(FieldMapper fieldMapper){
this.fieldMapper = fieldMapper;
@@ -48,13 +50,13 @@ public class LangEncoder implements Inde
} else { //default
//search in the language merger field of the default language
constraint.addEncoded(PREFIX, SolrUtil.escapeSolrSpecialChars(fieldMapper.getLanguageMergerField(null)));
- String[] prefixSuffix = fieldMapper.encodeDataType(STRING_DATATYPE);
- if(prefixSuffix[0] != null && !prefixSuffix[0].isEmpty()){
- constraint.addEncoded(PREFIX, prefixSuffix[0]);
- }
- if(prefixSuffix[1] != null && !prefixSuffix[1].isEmpty()){
- constraint.addEncoded(SUFFIX, prefixSuffix[1]);
- }
+// String[] prefixSuffix = fieldMapper.encodeDataType(STRING_DATATYPE);
+// if(prefixSuffix[0] != null && !prefixSuffix[0].isEmpty()){
+// constraint.addEncoded(PREFIX, prefixSuffix[0]);
+// }
+// if(prefixSuffix[1] != null && !prefixSuffix[1].isEmpty()){
+// constraint.addEncoded(SUFFIX, prefixSuffix[1]);
+// }
}
}
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LeEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LeEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LeEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LeEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LtEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LtEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LtEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/LtEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/RegexEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/RegexEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/RegexEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/RegexEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/WildcardEncoder.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/WildcardEncoder.java?rev=1071235&r1=1071234&r2=1071235&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/WildcardEncoder.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/constraintEncoders/WildcardEncoder.java Wed Feb 16 12:53:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.entityhub.yard.solr.impl.constraintEncoders;
+package org.apache.stanbol.entityhub.yard.solr.impl.constraintencoders;
import java.util.Arrays;
import java.util.Collection;