review chgs nr 11

irods · Apr 8, 2022 · be363fd · be363fd
1 parent 431efc8
commit be363fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/indexing_utilities.cpp b/indexing_utilities.cpp
@@ -287,8 +287,8 @@ namespace irods {
                     std::set<index_info> s;
                     irods::query q {&comm,
                         fmt::format("select META_COLL_ATTR_NAME,META_COLL_ATTR_VALUE,META_COLL_ATTR_UNITS where"
-                                                 " COLL_NAME = '{}' and META_COLL_ATTR_NAME = '{}' "
-                                                 " and  META_COLL_ATTR_VALUE like '%::metadata'", collname, config_.index)};
+                                    " COLL_NAME = '{}' and META_COLL_ATTR_NAME = '{}' "
+                                    " and  META_COLL_ATTR_VALUE like '%::metadata'", collname, config_.index)};
                     for (const auto &row : q) {
                         std::string idx_name, idx_type, idx_tech;
                         std::tie(idx_name, idx_type) = irods::indexing::parse_indexer_string(row[1]);

diff --git a/libirods_rule_engine_plugin-indexing.cpp b/libirods_rule_engine_plugin-indexing.cpp
@@ -782,13 +782,16 @@ namespace {
         //  Is the given user/group name actually a group?
 
         bool is_group( const std::string& gid ) {
+            return groups_.find(gid) != groups_.end();
+		/*
             try {
                 groups_.at(gid);
             }
             catch (const std::out_of_range&) {
                 return false;
             }
             return true;
+	    */
         }
 
         //  Is the given user a member of the given group ?

diff --git a/path_calc.hpp b/path_calc.hpp
@@ -64,9 +64,9 @@ namespace irods {
                     return calc("/");
                 }
                 auto parent_path_length = (pos == 0) ? 1 : pos;
-                auto accumulated_set = accum(path.substr(0,parent_path_length));
+                auto accumulated_set = accum(path.substr(0, parent_path_length));
                 const auto& current_path_set = calc(path);
-                accumulated_set.insert (current_path_set.begin(), current_path_set.end());
+                accumulated_set.insert(current_path_set.begin(), current_path_set.end());
                 return accumulated_set;
             }