You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/05/26 21:45:43 UTC

svn commit: r1681828 - in /lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene: document/package.html search/GeoPointInBBoxQuery.java search/package.html util/package.html

Author: mikemccand
Date: Tue May 26 19:45:43 2015
New Revision: 1681828

URL: http://svn.apache.org/r1681828
Log:
LUCENE-6481: fix some precommit issues

Added:
    lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/document/package.html   (with props)
    lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/util/package.html   (with props)
Modified:
    lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java
    lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/package.html

Added: lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/document/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/document/package.html?rev=1681828&view=auto
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/document/package.html (added)
+++ lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/document/package.html Tue May 26 19:45:43 2015
@@ -0,0 +1,28 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+ 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.
+-->
+
+<!-- not a package-info.java, because we already defined this package in core/ -->
+
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body>
+This package contains a single Field implementation, GeoPointField, to index a lat/lon geospatial point.
+</body>
+</html>

Modified: lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java?rev=1681828&r1=1681827&r2=1681828&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java Tue May 26 19:45:43 2015
@@ -212,14 +212,16 @@ public class GeoPointInBBoxQuery extends
     @Override
     protected final BytesRef nextSeekTerm(BytesRef term) {
       while (!rangeBounds.isEmpty()) {
-        if (currentRange == null)
+        if (currentRange == null) {
           nextRange();
+        }
 
         // if the new upper bound is before the term parameter, the sub-range is never a hit
         if (term != null && term.compareTo(currentUpperBound) > 0) {
           nextRange();
-	        if (!rangeBounds.isEmpty())
-	          continue;
+          if (!rangeBounds.isEmpty()) {
+            continue;
+          }
         }
         // never seek backwards, so use current term if lower bound is smaller
         return (term != null && term.compareTo(currentLowerBound) > 0) ?

Modified: lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/package.html?rev=1681828&r1=1681827&r2=1681828&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/package.html (original)
+++ lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/search/package.html Tue May 26 19:45:43 2015
@@ -23,6 +23,6 @@
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
-This package contains a single proximity query, TermAutomatonQuery.
+This package contains a flexible graph-based proximity query, TermAutomatonQuery, and geospatial queries.
 </body>
 </html>

Added: lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/util/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/util/package.html?rev=1681828&view=auto
==============================================================================
--- lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/util/package.html (added)
+++ lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/util/package.html Tue May 26 19:45:43 2015
@@ -0,0 +1,28 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+ 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.
+-->
+
+<!-- not a package-info.java, because we already defined this package in core/ -->
+
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body>
+This package contains utility APIs, currently for geospatial searching.
+</body>
+</html>