detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

svn version from svn works for text client

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-12-17 15:47:36 +00:00
parent 2f058c89a6
commit 5f74a469eb
10 changed files with 71 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -8,7 +8,7 @@
#include <arpa/inet.h>
#include <bitset>
#include <cstdlib>
#include "svnInfo.h"
#include "svnInfoLib.h"
int slsDetector::initSharedMemory(detectorType type, int id) {
@ -1588,8 +1588,9 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif
if (mode==THIS_SOFTWARE_VERSION) {
ret=OK;
svnInfo* s = new svnInfo(THIS_PATH);
retval=(thisSoftwareVersion<<32) | (s->getRevision());
// svnInfo* s = new svnInfo(THIS_PATH);
retval=SVNREVLIB;
retval=(retval<<32) | SVNDATELIB;
} else {
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {