Merge pull request #49 from jateeter/master

Added support for:

Author: jateeter

src/main/java/org/energyos/espi/common/domain/MeterReading.java

@@ -72,8 +72,8 @@
                 query = "SELECT reading.id FROM MeterReading reading WHERE reading.usagePoint.id = :usagePointId"),
         @NamedQuery(name = MeterReading.QUERY_FIND_ALL_IDS,
                 query = "SELECT meterReading.id FROM MeterReading meterReading"),
-        @NamedQuery(name = MeterReading.QUERY_FIND_ALL_IDS_BY_XPATH_2, query = "SELECT DISTINCT m.id FROM UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1Id AND  m.usagePoint.id = :o2Id"),
-        @NamedQuery(name = MeterReading.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT m.id FROM UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1Id AND m.usagePoint.id = :o2Id AND m.id = :o3Id")
+        @NamedQuery(name = MeterReading.QUERY_FIND_ALL_IDS_BY_XPATH_2, query = "SELECT DISTINCT m.id FROM UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1Id AND m.usagePoint.id = :o2Id"),
+        @NamedQuery(name = MeterReading.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT m.id FROM  UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1ID AND m.usagePoint.id = :o2Id AND m.id = :o3Id")
 
 })
 public class MeterReading extends IdentifiedObject

src/main/java/org/energyos/espi/common/domain/Routes.java

@@ -106,7 +106,8 @@ public class Routes {
     public static final String RETAIL_CUSTOMER_MEMBER_UPLOAD_MY_DATA = "/espi/1_1/resource/RetailCustomer/{retailCustomerId}/UploadMyData";
 
     // paterns for RESTful Batch services
-    public static final String BATCH_DOWNLOAD_MY_DATA = "/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}";
+    public static final String BATCH_DOWNLOAD_MY_DATA_COLLECTION = "/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}";
+    public static final String BATCH_DOWNLOAD_MY_DATA_MEMBER = "/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint/{usagePointId}";
     public static final String BATCH_UPLOAD_MY_DATA = "/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}";
     public static final String BATCH_BULK_MEMBER = "/espi/1_1/resource/Batch/Bulk/{bulkId}";
     public static final String BATCH_SUBSCRIPTION = "/espi/1_1/resource/Batch/Subscription/{subscriptionId}";

src/main/java/org/energyos/espi/common/service/impl/ExportServiceImpl.java

@@ -508,7 +508,7 @@ public void exportUsagePointsFull(Long retailCustomerId,
 	@Override
 	public void exportUsagePointFull(Long usagePointId, Long retailCustomerId,
 			ServletOutputStream outputStream, ExportFilter exportFilter) throws IOException {
-		String hrefFragment = "/Batch/RetailCustomer/" + retailCustomerId + "/UsagePoint" + usagePointId;
+		String hrefFragment = "/Batch/RetailCustomer/" + retailCustomerId + "/UsagePoint/" + usagePointId;
 		exportEntriesFull(usagePointService.findEntryTypeIterator(retailCustomerId, usagePointId), outputStream, exportFilter, hrefFragment);
 
 	}

src/main/java/org/energyos/espi/common/utils/ExportFilter.java

@@ -55,11 +55,10 @@ public boolean matches(EntryType entry) {
         }
 
         if (hasParam("start-index")) {
-        	if (!(params.get("start-index").equals("1"))) {
-        		if (matchedCounter < Integer.valueOf(params.get("start-index"))) {
+        	if (matchedCounter < Integer.valueOf(params.get("start-index"))) {
                     matchedCounter++;
                     return false;
-        		}
+        		
         	}
         }