Slight refactor to Vector Index get

src/hdmf/common/table.py

@@ -160,6 +160,11 @@ def add_row(self, arg, **kwargs):
         """
         self.add_vector(arg, **kwargs)
 
+    def __get_slice(self, arg):
+        start = 0 if arg == 0 else self.data[arg - 1]
+        end = self.data[arg]
+        return slice(start, end)
+
     def __getitem_helper(self, arg, **kwargs):
         """
         Internal helper function used by __getitem__ to retrieve a data value from self.target
@@ -168,9 +173,8 @@ def __getitem_helper(self, arg, **kwargs):
         :param kwargs: any additional arguments to *get* method of the self.target VectorData
         :return: Scalar or list of values retrieved
         """
-        start = 0 if arg == 0 else self.data[arg - 1]
-        end = self.data[arg]
-        return self.target.get(slice(start, end), **kwargs)
+        slices = self.__get_slice(arg)
+        return self.target.get(slices, **kwargs)
 
     def __getitem__(self, arg):
         """
@@ -199,8 +203,20 @@ def get(self, arg, **kwargs):
                     arg = np.where(arg)[0]
                 indices = arg
             ret = list()
-            for i in indices:
-                ret.append(self.__getitem_helper(i, **kwargs))
+            if len(indices) > 0: # This is for test_to_hierarchical_dataframe_empty_tables
+                try:
+                    data = self.target.get(slice(None),  **kwargs)
+                    slices = [self.__get_slice(i) for i in indices]
+                    if isinstance(data, pd.DataFrame):
+                        ret = [data.iloc[s] for s in slices]
+                    else:
+                        ret = [data[s] for s in slices]
+                except IndexError:
+                    """
+                    Note: TODO: test_to_hierarchical_dataframe_indexed_dtr_on_last_level
+                    """
+                    for i in indices:
+                        ret.append(self.__getitem_helper(i, **kwargs))
             return ret
 
 
@@ -1453,7 +1469,6 @@ def get(self, arg, index=False, df=True, **kwargs):
             return ret
         elif isinstance(arg, (list, slice, np.ndarray)):
             idx = arg
-
             # get the data at the specified indices
             if isinstance(self.data, (tuple, list)) and isinstance(idx, (list, np.ndarray)):
                 ret = [self.data[i] for i in idx]