Refactor libimagentrycategory to fit new store iterator interface

lib/entry/libimagentrycategory/src/category.rs

@@ -55,7 +55,7 @@ impl Category for Entry {
 
     fn get_entries<'a>(&self, store: &'a Store) -> Result<CategoryEntryIterator<'a>> {
         trace!("Getting linked entries for category '{:?}'", self.get_location());
-        let sit  = self.get_internal_links()?.map(|l| l.get_store_id().clone());
+        let sit  = self.get_internal_links()?.map(|l| l.get_store_id().clone()).map(Ok);
         let sit  = StoreIdIterator::new(Box::new(sit));
         let name = self.get_name()?;
         Ok(CategoryEntryIterator::new(store, sit, name))

lib/entry/libimagentrycategory/src/iter.rs

@@ -60,6 +60,9 @@ impl<'a> Iterator for CategoryNameIter<'a> {
         let query = CATEGORY_REGISTER_NAME_FIELD_PATH;
 
         while let Some(sid) = self.1.next() {
+            match sid {
+                Err(e) => return Some(Err(e).map_err(CE::from)),
+                Ok(sid) => {
                     if sid.is_in_collection(&["category"]) {
                         let func = |store: &Store| { // hack for returning Some(Result<_, _>)
                             store
@@ -72,6 +75,8 @@ impl<'a> Iterator for CategoryNameIter<'a> {
                         };
 
                     return Some(func(&self.0))
+                    }
+                },
             } // else continue
         }
 
@@ -92,6 +97,9 @@ impl<'a> Iterator for CategoryEntryIterator<'a> {
 
     fn next(&mut self) -> Option<Self::Item> {
         while let Some(next) = self.1.next() {
+            match next {
+                Err(e) => return Some(Err(e).map_err(CE::from)),
+                Ok(next) => {
                     let getter = |next| -> Result<(String, FileLockEntry<'a>)> {
                         let entry = self.0
                             .get(next)?
@@ -110,6 +118,8 @@ impl<'a> Iterator for CategoryEntryIterator<'a> {
                         }
                     }
                 }
+            }
+        }
 
         None
     }