diff --git a/Makefile b/Makefile
index 0a63d192589a1178f3b1edc7b8deb9a5ed1ea820..12743ce3b95613142b44a508d136ad5fb9912c0e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ MAKEFILE = Makefile
CC = gcc
CXX = g++
-DEFINES = -DQT_NO_DEBUG_OUTPUT -DQTANGO_PRINTINFO -DQTANGO_VERSION_STR="\"6.4.4\"" -DQTANGO_VERSION=0x060404 -DVER_MAJ=6 -DVER_MIN=4 -DVER_FIX=4 -D__x86_64__ -D__linux__ -D__OSVERSION__=2 -DQT_CONCURRENT_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB -DQT_DBUS_LIB -DQT_CORE_LIB
+DEFINES = -DQT_NO_DEBUG_OUTPUT -DQTANGO_PRINTINFO -DQTANGO_VERSION_STR="\"6.5.1\"" -DQTANGO_VERSION=0x060501 -DVER_MAJ=6 -DVER_MIN=5 -DVER_FIX=1 -D__x86_64__ -D__linux__ -D__OSVERSION__=2 -DQT_CONCURRENT_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB -DQT_DBUS_LIB -DQT_CORE_LIB
CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
CXXFLAGS = -std=c++11 -Wall -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
INCPATH = -I. -I/usr/local/qwt-6.1.3/include -isystem /usr/include/qwt -I/usr/local/qtango/include/qtango6 -I/usr/local/qwt-6.1.3/include -isystem /usr/include/qwt -I/usr/local/tango-9.3.3/include/tango -I/usr/local/tango-9.3.3/include -I/usr/local/omniorb-4.2.3/include -I/usr/local/zeromq-4.0.8/include -I/usr/local/qt/5.11.1/gcc_64/include/QtConcurrent -I/usr/local/qt/5.11.1/gcc_64/include -I/usr/local/qt/5.11.1/gcc_64/include/QtPrintSupport -I/usr/local/qt/5.11.1/gcc_64/include/QtSvg -I/usr/local/qt/5.11.1/gcc_64/include/QtOpenGL -I/usr/local/qt/5.11.1/gcc_64/include/QtWidgets -I/usr/local/qt/5.11.1/gcc_64/include/QtGui -I/usr/local/qt/5.11.1/gcc_64/include/QtCore -I/usr/local/qt/5.11.1/gcc_64/include/QtX11Extras -I/usr/local/qt/5.11.1/gcc_64/include/QtDBus -Imoc -isystem /usr/include/libdrm -Isrc -I/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++
@@ -34,8 +34,8 @@ DEL_DIR = rmdir
MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
-DISTNAME = acs6.4.4
-DISTDIR = /home/zambonl/devel/fermi/panels/accesscontrol/acs/obj/acs6.4.4
+DISTNAME = acs6.5.1
+DISTDIR = /home/lucio.zambon/devel/fermi/panels/pss/acs/obj/acs6.5.1
LINK = g++
LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/qt/5.11.1/gcc_64/lib -Wl,-rpath-link,/usr/local/qt/5.11.1/gcc_64/lib
LIBS = $(SUBLIBS) -L/usr/local/qtango/lib -lcurl -L/usr/local/tango-9.3.3/lib -L/usr/local/omniorb-4.2.3/lib -L/usr/local/zeromq-4.0.8/lib -ltango -lzmq -lCOS4 -lomniDynamic4 -lomniORB4 -lomnithread -lX11 -L/usr/local/qwt-6.1.3/lib -L/usr/local/qt/5.11.1/gcc_64/lib -lqwt -lQt5Concurrent -lQt5Svg -lQt5OpenGL -lQt5PrintSupport -lQt5Widgets -lQt5X11Extras -lQt5Gui -lQt5DBus -lQt5Core -lGL -lpthread
@@ -225,6 +225,7 @@ DIST = /usr/local/qtango/include/qtango6/messages.pri \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf \
+ .qmake.stash \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf \
@@ -431,6 +432,7 @@ Makefile: acs.pro /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf /usr/
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf \
+ .qmake.stash \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf \
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf \
@@ -634,6 +636,7 @@ Makefile: acs.pro /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf /usr/
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf:
/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf:
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf:
+.qmake.stash:
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf:
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf:
/usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf:
@@ -991,7 +994,7 @@ moc/moc_acs.cpp: src/ui_acs.h \
src/acs.h \
moc/moc_predefs.h \
/usr/local/qt/5.11.1/gcc_64/bin/moc
- /usr/local/qt/5.11.1/gcc_64/bin/moc $(DEFINES) --include moc/moc_predefs.h -I/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++ -I/home/zambonl/devel/fermi/panels/accesscontrol/acs -I/usr/local/qwt-6.1.3/include -I/usr/include/qwt -I/usr/local/qtango/include/qtango6 -I/usr/local/qwt-6.1.3/include -I/usr/include/qwt -I/usr/local/tango-9.3.3/include/tango -I/usr/local/tango-9.3.3/include -I/usr/local/omniorb-4.2.3/include -I/usr/local/zeromq-4.0.8/include -I/usr/local/qt/5.11.1/gcc_64/include/QtConcurrent -I/usr/local/qt/5.11.1/gcc_64/include -I/usr/local/qt/5.11.1/gcc_64/include/QtPrintSupport -I/usr/local/qt/5.11.1/gcc_64/include/QtSvg -I/usr/local/qt/5.11.1/gcc_64/include/QtOpenGL -I/usr/local/qt/5.11.1/gcc_64/include/QtWidgets -I/usr/local/qt/5.11.1/gcc_64/include/QtGui -I/usr/local/qt/5.11.1/gcc_64/include/QtCore -I/usr/local/qt/5.11.1/gcc_64/include/QtX11Extras -I/usr/local/qt/5.11.1/gcc_64/include/QtDBus -I/usr/include/c++/7 -I/usr/include/x86_64-linux-gnu/c++/7 -I/usr/include/c++/7/backward -I/usr/lib/gcc/x86_64-linux-gnu/7/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include src/acs.h -o moc/moc_acs.cpp
+ /usr/local/qt/5.11.1/gcc_64/bin/moc $(DEFINES) --include moc/moc_predefs.h -I/usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++ -I/home/lucio.zambon/devel/fermi/panels/pss/acs -I/usr/local/qwt-6.1.3/include -I/usr/include/qwt -I/usr/local/qtango/include/qtango6 -I/usr/local/qwt-6.1.3/include -I/usr/include/qwt -I/usr/local/tango-9.3.3/include/tango -I/usr/local/tango-9.3.3/include -I/usr/local/omniorb-4.2.3/include -I/usr/local/zeromq-4.0.8/include -I/usr/local/qt/5.11.1/gcc_64/include/QtConcurrent -I/usr/local/qt/5.11.1/gcc_64/include -I/usr/local/qt/5.11.1/gcc_64/include/QtPrintSupport -I/usr/local/qt/5.11.1/gcc_64/include/QtSvg -I/usr/local/qt/5.11.1/gcc_64/include/QtOpenGL -I/usr/local/qt/5.11.1/gcc_64/include/QtWidgets -I/usr/local/qt/5.11.1/gcc_64/include/QtGui -I/usr/local/qt/5.11.1/gcc_64/include/QtCore -I/usr/local/qt/5.11.1/gcc_64/include/QtX11Extras -I/usr/local/qt/5.11.1/gcc_64/include/QtDBus -I/usr/include/c++/7 -I/usr/include/x86_64-linux-gnu/c++/7 -I/usr/include/c++/7/backward -I/usr/lib/gcc/x86_64-linux-gnu/7/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include src/acs.h -o moc/moc_acs.cpp
compiler_moc_objc_header_make_all:
compiler_moc_objc_header_clean:
@@ -1652,7 +1655,8 @@ obj/moc_acs.o: moc/moc_acs.cpp
install_inst: first FORCE
@test -d $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin || mkdir -p $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin
- -$(QINSTALL_PROGRAM) /home/zambonl/devel/fermi/panels/accesscontrol/acs/bin/acs $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin/acs
+ -$(QINSTALL_PROGRAM) /home/lucio.zambon/devel/fermi/panels/pss/acs/bin/acs $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin/acs
+ -strip $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin/acs
uninstall_inst: FORCE
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/qtango/fermi/panels/bin/acs
diff --git a/src/acs.cpp b/src/acs.cpp
index ab8367944614180ee1fa837dcf9f67f1c6ccfc6f..24445947cdd19a03dfe53d26a99016cf5c7fee6c 100644
--- a/src/acs.cpp
+++ b/src/acs.cpp
@@ -31,6 +31,7 @@ char tmBuffer[80];
int noSrvRetry;
double resizeFactorX, resizeFactorY, resizeFactorM;
string strstat, linac_strstat, uh_strstat;
+time_t ack_time = time(NULL) -88000;
/*
timestamp()
@@ -55,12 +56,16 @@ size_t write_data(char *ptr, size_t size, size_t nmemb, void *userdata) {
return size * nmemb;
}
void acs::web_read(char *url, const char *data) {
- if (strlen(data)==0) return;
+ /*if (strlen(data)==0) return;
unsigned idata=0;
while (data[idata]==' ') {
idata++;
if (idata == strlen(data)) return;
}
+ */
+ time_t t;
+ t = time(NULL);
+ if (t - ack_time < 86400) return;
CURL *curl;
CURLcode res;
curl = curl_easy_init();
@@ -74,9 +79,11 @@ void acs::web_read(char *url, const char *data) {
res = curl_easy_perform(curl);
cout << "res: " << res << ", web_data: " << web_data << endl;
if (res == CURLE_OK && !web_data.compare("NOK")) {
+ ack_time = t;
QMessageBox::information(this, "REGISTRAZIONE MANCANTE", "ATTENZIONE, badge non presente nel registro elettronico degli accessi\nEffettuare al piu' presto la registrazione", QMessageBox::Ok);
}
else if (res != CURLE_OK || web_data.compare("OK")) {
+ ack_time = t;
QMessageBox::information(this, "REGISTRAZIONE ACCESSO", "ATTENZIONE, non e' stato possibile contattare il registro elettronico degli accessi\nSi prega di verificare con cura che sia presente una registrazione", QMessageBox::Ok);
}
web_data.clear();