clean up

Author: d-w-moore

indexing_utilities.cpp

@@ -336,11 +336,6 @@ namespace irods {
             };
             path_calc_and_cache <index_info> idx_info_cache {f};
 
-/* DWM - delete
-            rodsLog( LOG_NOTICE, "DWM - index_type [%s]" , _index_type.c_str() );
-            rodsLog( LOG_NOTICE, "DWM - index_name [%s]" , _index_name.c_str() );
-            rodsLog( LOG_NOTICE, "DWM - indexer    [%s]" , _indexer.c_str());
-*/
             bool Search_parent_tags = (_indexer.empty() && _index_name.empty());
 
             const auto indexing_resources = get_indexing_resource_names();

libirods_rule_engine_plugin-indexing.cpp

@@ -35,6 +35,7 @@
 #include <iterator>
 #include <algorithm>
 #include <typeinfo>
+#include <stdexcept>
 
 // =-=-=-=-=-=-=-
 // boost includes
@@ -415,19 +416,9 @@ namespace {
                 if (auto* p = getValByKey( &obj_inp->condInput, FORCE_FLAG_KW); p != 0) { rm_force_kw = p; }
                 indices_for_rm_coll = get_indices_for_delete_by_query (*_rei->rsComm, obj_inp->objPath, false);
             }
-            else if(//"pep_api_mod_access_control_pre" == _rn ||
-                    "pep_api_mod_access_control_post" == _rn ) {
-
+            else if("pep_api_mod_access_control_post" == _rn ) {
                 irods::indexing::indexer idx{_rei, config->instance_name_};
-
-                auto it = _args.begin();std::ostringstream s;
-/*
-                for (const auto & i :_args) {
-                                s << i.type().name() << " dwm\n";
-                }
-
-                rodsLog(LOG_NOTICE,"DWM: %s ---> %s",_rn.c_str(),s.str().c_str());
-*/
+                auto it = _args.begin();
                 std::advance(it, 2);
                 if(_args.end() == it) {
                     THROW(
@@ -437,39 +428,31 @@ namespace {
                 try {
                     const auto* access_ctl = boost::any_cast<modAccessControlInp_t*>(*it);
                     if (access_ctl) {
-                        const auto &[recursive,level,userN,zone,logical_path] = *access_ctl;
-                        s    << "recurs "<< recursive <<" "
-                             << "accessLvl "<<level<<" "
-                             << "userName "<<userN<<" "
-                             << "zone "<<zone<<" "
-                             << "path "<<logical_path<<"\n";
-                        rodsLog(LOG_NOTICE,"DWM: --- %s",s.str().c_str());
-    //dwm-
+                        const auto &[recursive, level_, userN_, zone_, logical_path] = *access_ctl;
+
                         namespace fsvr = irods::experimental::filesystem::server;
                         if (recursive && fsvr::is_collection(*_rei->rsComm,logical_path)) {
                             idx.schedule_collection_operation(
                                 irods::indexing::operation_type::index,
                                 logical_path,
                                 _rei->rsComm->clientUser.userName
-                                , "::metadata"  //value // DWM -> Empty fields for index_name , index_type ,
-                                , ""    //units // DWM       and index technology will signal that the collection
-                                );      // operation should search upward in hierarchy for indexing tags
+                                , "::metadata"  //value // -> Empty fields for index_name , index_type ,
+                                , ""            //units //    and index technology will signal that the collection
+                                );                      // operation should search upward in hierarchy for indexing tags
                         }
                         else {
                             idx.schedule_metadata_indexing_event(
                                     logical_path,
                                     _rei->rsComm->clientUser.userName,
-                                    "null" // attribute, 
+                                    "null" // attribute,
                                     "bb" // value,
                                     "cc" // units
-);
+                            );
                         }
                     }
                 }
-                catch(...){
-                      rodsLog(LOG_NOTICE,"DWM: **- pep_api_data_obj_unlink_post **- ERROR");
-                }
-                rodsLog(LOG_NOTICE,"DWM: --- %s ---",_rn.c_str());
+                catch(const std::exception &e){ const char* message = e.what();
+                                                rodsLog(LOG_NOTICE,"Exception during pep_api_data_obj_unlink_post: %s",message); }
             }
             else if("pep_api_data_obj_unlink_post" == _rn) {
                 auto it = _args.begin();