You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2007/05/29 23:11:36 UTC
svn commit: r542653 - in /lucene/solr/trunk: example/exampledocs/
src/java/org/apache/solr/search/ src/java/org/apache/solr/util/
src/test/org/apache/solr/analysis/ src/test/org/apache/solr/search/
src/webapp/resources/
Author: yonik
Date: Tue May 29 14:11:35 2007
New Revision: 542653
URL: http://svn.apache.org/viewvc?view=rev&rev=542653
Log:
add ASF license
Modified:
lucene/solr/trunk/example/exampledocs/spellchecker.xml
lucene/solr/trunk/src/java/org/apache/solr/search/QueryUtils.java
lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java
lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
lucene/solr/trunk/src/test/org/apache/solr/search/TestQueryUtils.java
lucene/solr/trunk/src/webapp/resources/index.html
Modified: lucene/solr/trunk/example/exampledocs/spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/exampledocs/spellchecker.xml?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/example/exampledocs/spellchecker.xml (original)
+++ lucene/solr/trunk/example/exampledocs/spellchecker.xml Tue May 29 14:11:35 2007
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<add>
<doc>
<field name="id">1</field>
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QueryUtils.java?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/QueryUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/QueryUtils.java Tue May 29 14:11:35 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.search;
import org.apache.lucene.search.Query;
@@ -66,37 +83,6 @@
}
return newBq;
}
-
-
- /*** TODO: use after next lucene update
- List <BooleanClause> clauses = (List <BooleanClause>)bq.clauses();
- // A single filtered out stopword currently causes a BooleanQuery with
- // zero clauses.
- if (clauses.size()==0) return q;
-
- for (BooleanClause clause: clauses) {
- if (!clause.isProhibited()) return q;
- }
-
- if (clauses.size()==1) {
- // if only one clause, dispense with the wrapping BooleanQuery
- Query negClause = clauses.get(0).getQuery();
- // we shouldn't need to worry about adjusting the boosts since the negative
- // clause would have never been selected in a positive query, and hence the
- // boost is meaningless.
- return negClause;
- } else {
- BooleanQuery newBq = new BooleanQuery(bq.isCoordDisabled());
- newBq.setBoost(bq.getBoost());
- // ignore minNrShouldMatch... it doesn't make sense for a negative query
-
- // the inverse of -a -b is a b
- for (BooleanClause clause: clauses) {
- newBq.add(clause.getQuery(), BooleanClause.Occur.SHOULD);
- }
- return newBq;
- }
- ***/
}
/** Makes negative queries suitable for querying by
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java Tue May 29 14:11:35 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.util;
import java.io.ByteArrayInputStream;
Modified: lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java Tue May 29 14:11:35 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.analysis;
import java.io.IOException;
Modified: lucene/solr/trunk/src/test/org/apache/solr/search/TestQueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/search/TestQueryUtils.java?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/search/TestQueryUtils.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/search/TestQueryUtils.java Tue May 29 14:11:35 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.search;
import junit.framework.TestCase;
Modified: lucene/solr/trunk/src/webapp/resources/index.html
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/resources/index.html?view=diff&rev=542653&r1=542652&r2=542653
==============================================================================
--- lucene/solr/trunk/src/webapp/resources/index.html (original)
+++ lucene/solr/trunk/src/webapp/resources/index.html Tue May 29 14:11:35 2007
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<html>
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css">