diff --git a/ass1-doc/src/main/java/dst/ass1/doc/impl/DocumentQuery.java b/ass1-doc/src/main/java/dst/ass1/doc/impl/DocumentQuery.java index ad74fcf..d1fae1f 100644 --- a/ass1-doc/src/main/java/dst/ass1/doc/impl/DocumentQuery.java +++ b/ass1-doc/src/main/java/dst/ass1/doc/impl/DocumentQuery.java @@ -37,6 +37,9 @@ public class DocumentQuery implements IDocumentQuery { List result = new ArrayList<>(); + System.out.printf("Searching for locations within %sm of longitude %s and latitude %s%n", + radius, longitude, latitude); + MongoCursor cursor = collection.find( Filters.and( Filters.regex(M_LOCATION_NAME, ".*" + name + ".*"), @@ -45,12 +48,20 @@ public class DocumentQuery implements IDocumentQuery { ).projection(Projections.include(I_LOCATION)).iterator(); try { - while (cursor.hasNext()) - result.add(cursor.next().getLong(I_LOCATION)); + while (cursor.hasNext()) { + Document next = cursor.next(); + System.out.printf("Adding location with id %s to results%n", next.getLong("location_id")); + result.add(next.getLong(I_LOCATION)); + } } finally { cursor.close(); } + if (result.isEmpty()) + System.out.println("No locations with the given criteria found!"); + else + System.out.println("Final result list: " + result.toString()); + return result; } @@ -77,12 +88,20 @@ public class DocumentQuery implements IDocumentQuery { try { while (cursor.hasNext()) { - result.add(cursor.next()); + Document next = cursor.next(); + System.out.printf("Adding category %s with value %s to results%n", + next.getString("_id"), next.getDouble("value")); + result.add(next); } } finally { cursor.close(); } + if (result.isEmpty()) + System.out.println("No categories found for type == 'place'!"); + else + System.out.println("Final result list: " + result.toString()); + return result; } }