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/license++.cpp | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/library/license++.cpp b/src/library/license++.cpp
index 3e4ae40..b702d51 100644
--- a/src/library/license++.cpp
+++ b/src/library/license++.cpp
@@ -1,6 +1,6 @@
//============================================================================
// Name : license-manager-cpp.cpp
-// Author :
+// Author :
// Version :
// Copyright : BSD
//============================================================================
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <cstring>
+#include <iostream>
#include "api/license++.h"
@@ -41,7 +42,7 @@
}
EVENT_TYPE acquire_license(const char * product,
- LicenseLocation licenseLocation, LicenseInfo* license) {
+ const LicenseLocation* licenseLocation, LicenseInfo* licenseInfoOut) {
license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
license::EventRegistry er = lr.readLicenses(string(product), licenses);
@@ -50,28 +51,32 @@
vector<license::FullLicenseInfo> licenses_with_errors;
vector<license::FullLicenseInfo> licenses_ok;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
- license::EventRegistry validation_er = it->validate(0);
- if (validation_er.isGood()) {
+ bool valid = it->validate(0,er);
+ if (valid) {
licenses_ok.push_back(*it);
} else {
licenses_with_errors.push_back(*it);
}
- er.append(validation_er);
}
if (licenses_ok.size() > 0) {
- er.turnErrosIntoWarnings();
+ er.turnErrorsIntoWarnings();
result = LICENSE_OK;
- mergeLicenses(licenses_ok, license);
+ mergeLicenses(licenses_ok, licenseInfoOut);
} else {
+ er.turnWarningsIntoErrors();
result = er.getLastFailure()->event_type;
- mergeLicenses(licenses_with_errors, license);
+ mergeLicenses(licenses_with_errors, licenseInfoOut);
}
} else {
+ er.turnWarningsIntoErrors();
result = er.getLastFailure()->event_type;
}
- if (license != nullptr) {
- er.exportLastEvents(license->status, 5);
+#ifdef _DEBUG
+ cout << er <<endl;
+#endif
+ if (licenseInfoOut != nullptr) {
+ er.exportLastEvents(licenseInfoOut->status, AUDIT_EVENT_NUM);
}
return result;
}
--
Gitblit v1.9.1