From 8bbef2865455754425a84b86680a89bff8aa7691 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 19 10月 2019 08:50:45 +0800
Subject: [PATCH] issue #64 , issue #56 (part)
---
src/library/locate/EnvironmentVarLocation.cpp | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/library/locate/EnvironmentVarLocation.cpp b/src/library/locate/EnvironmentVarLocation.cpp
index c8b23dc..a904b9a 100644
--- a/src/library/locate/EnvironmentVarLocation.cpp
+++ b/src/library/locate/EnvironmentVarLocation.cpp
@@ -22,8 +22,8 @@
EnvironmentVarLocation::~EnvironmentVarLocation() {
}
-const vector<string> EnvironmentVarLocation::licenseLocations(
- EventRegistry &eventRegistry) const {
+const vector<string> EnvironmentVarLocation::license_locations(
+ EventRegistry &eventRegistry) {
vector<string> licenseFileFoundWithEnvVariable;
const string varName(LICENSE_LOCATION_ENV_VAR);
@@ -33,20 +33,10 @@
if (env_var_value != nullptr && env_var_value[0] != '\0') {
const vector<string> declared_positions = license::split_string(
string(env_var_value), ';');
- vector<string> existing_pos = license::filter_existing_files(
- declared_positions);
- if (existing_pos.size() > 0) {
- for (auto it = existing_pos.begin(); it != existing_pos.end();
- ++it) {
- licenseFileFoundWithEnvVariable.push_back(*it);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
- }
- } else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- env_var_value);
- }
+ licenseFileFoundWithEnvVariable = license::filter_existing_files(
+ declared_positions, eventRegistry, LICENSE_LOCATION_ENV_VAR);
} else {
- eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
+ eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED);
}
}
return licenseFileFoundWithEnvVariable;
--
Gitblit v1.9.1