From a26bd812ef3fd21dd3d68bd10704ae3dd8eeea6b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 10 11月 2019 22:25:22 +0800
Subject: [PATCH] improvements for issue #42
---
src/library/locate/ApplicationFolder.cpp | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index cd25815..e6a7446 100644
--- a/src/library/locate/ApplicationFolder.cpp
+++ b/src/library/locate/ApplicationFolder.cpp
@@ -8,7 +8,7 @@
#include <sstream>
#include <string>
-#include <build_properties.h>
+//B#include <build_properties.h>
#include "../base/logger.h"
#include "../api/datatypes.h"
@@ -25,29 +25,25 @@
ApplicationFolder::ApplicationFolder() :
LocatorStrategy("ApplicationFolder") {
-
}
ApplicationFolder::~ApplicationFolder() {
}
-const vector<string> ApplicationFolder::licenseLocations(
- EventRegistry &eventRegistry) const {
+const vector<string> ApplicationFolder::license_locations(
+ EventRegistry &eventRegistry) {
vector<string> diskFiles;
char fname[MAX_PATH] = { 0 };
const FUNCTION_RETURN fret = getModuleName(fname);
- cout << string(fname) << endl;
- cout << fret << endl;
if (fret == FUNC_RET_OK) {
- const string temptativeLicense = string(fname) + ".lic";
+ const string module_name = remove_extension(fname);
+ const string temptativeLicense = string(module_name) + ".lic";
ifstream f(temptativeLicense.c_str());
if (f.good()) {
diskFiles.push_back(temptativeLicense);
- eventRegistry.addEvent((EVENT_TYPE) LICENSE_FILE_FOUND,
- (SEVERITY) SVRT_INFO, temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FOUND, temptativeLicense.c_str());
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, temptativeLicense.c_str());
}
f.close();
} else {
--
Gitblit v1.9.1