Fix a bug in listing user/group with pagination

cyverse · Mar 2, 2023 · f5a810c · f5a810c
1 parent c8e9543
commit f5a810c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/irods/fs/usergroup.go b/irods/fs/usergroup.go
@@ -26,7 +26,7 @@ func GetGroup(conn *connection.IRODSConnection, group string) (*types.IRODSUser,
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_USER_ID, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_NAME, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_TYPE, 1)
@@ -126,7 +126,7 @@ func ListGroupUsers(conn *connection.IRODSConnection, group string) ([]*types.IR
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_USER_ID, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_NAME, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_TYPE, 1)
@@ -224,7 +224,7 @@ func ListGroups(conn *connection.IRODSConnection) ([]*types.IRODSUser, error) {
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_USER_ID, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_NAME, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_TYPE, 1)
@@ -322,7 +322,7 @@ func ListUsers(conn *connection.IRODSConnection) ([]*types.IRODSUser, error) {
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_USER_ID, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_NAME, 1)
 		query.AddSelect(common.ICAT_COLUMN_USER_TYPE, 1)
@@ -420,7 +420,7 @@ func ListUserGroupNames(conn *connection.IRODSConnection, user string) ([]string
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_COLL_USER_GROUP_NAME, 1)
 
 		condTypeVal := fmt.Sprintf("= '%s'", user)
@@ -493,7 +493,7 @@ func ListUserResourceQuota(conn *connection.IRODSConnection, user string) ([]*ty
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_QUOTA_RESC_NAME, 1)
 		query.AddSelect(common.ICAT_COLUMN_QUOTA_LIMIT, 1)
 
@@ -583,7 +583,7 @@ func GetUserGlobalQuota(conn *connection.IRODSConnection, user string) (*types.I
 	continueQuery := true
 	continueIndex := 0
 	for continueQuery {
-		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, 0, 0, 0)
+		query := message.NewIRODSMessageQueryRequest(common.MaxQueryRows, continueIndex, 0, 0)
 		query.AddSelect(common.ICAT_COLUMN_QUOTA_LIMIT, 1)
 
 		condTypeVal := fmt.Sprintf("= '%s'", user)