CDPP / DDServer

Commit e3e174970a22e2dc69670008fa3faa0e4705abf6

Authored by Benjamin Renard
1 parent d1327dc0
Exists in master and in 9 other branches WIP, clean_real, create-user, epntap, evol_9042, fix-cdaweb, sqlite_test, time-in-double, ubuntu

Some fix around remote parameters

Showing 4 changed files with 12 additions and 9 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @e3e1749
... ... @@ -83,4 +83,6 @@ install(DIRECTORY "src/REMOTEDATA/" DESTINATION bin/REMOTEDATA)
83 83 install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
84 84 install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
85 85  
  86 +install(FILES "src/DECODERS/cdf2nc/cdf_to_netcdf_mapping.dat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  87 +
86 88 SET(CMAKE_VERBOSE_MAKEFILE ON)
... ...
scripts/DDServer.env.in
  Diff comments   View file @e3e1749
... ... @@ -8,8 +8,8 @@ LD_LIBRARY_PATH=$DDLIB/:@NETCDFLIB_DIR@:@libcdf_LIBRARY_DIR@:@USRLIB_DIR@
8 8 DATAMANAGER=@CMAKE_INSTALL_PREFIX@/bin/DATAMANAGER
9 9 REMOTEDATA=@CMAKE_INSTALL_PREFIX@/bin/REMOTEDATA
10 10 CALLEXT=@CMAKE_INSTALL_PREFIX@/bin/CALLEXT
11   -PROXY_HOST=@PROXY_HOST@
12   -PROXY_USERPWD=@PROXY_USERPWD@
  11 +PROXY_HOST="@PROXY_HOST@"
  12 +PROXY_USERPWD="@PROXY_USERPWD@"
13 13  
14 14 export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH
15 15 export DATAMANAGER REMOTEDATA CALLEXT
... ...
src/CALLEXT/createVI.php
  Diff comments   View file @e3e1749
... ... @@ -39,6 +39,7 @@
39 39 exit(0);
40 40 }
41 41 }
  42 + define('RemoteData', $DDBASE."/../INFO");
42 43  
43 44 $LOGDIR = $DDBASE."/../LOG/";
44 45 if (!is_dir($LOGDIR))
... ... @@ -102,7 +103,7 @@
102 103 if (!$infoFile && $ncFiles)
103 104 {
104 105 if ($verbose)
105   - error_log("No dataset info file for ".$remSetID." from ".$dataBaseID." uses regular file".PHP_EOL, 3, log);
  106 + error_log("No dataset info file for ".$remSetID." from ".$ViId." uses regular file".PHP_EOL, 3, log);
106 107  
107 108 $infoFileName = strtolower($remSetID).".nc";
108 109 copy($ncFiles[0], $infoFileName);
... ...
src/DDSERVICES/SOAP/DDserverWeb.php
  Diff comments   View file @e3e1749
... ... @@ -21,7 +21,7 @@
21 21  
22 22 function isRemoteViAdded($baseId, $viId)
23 23 {
24   - $referXML = baseDir."DDsys.xml";
  24 + $referXML = baseDir."/DDsys.xml";
25 25 $DDsys = new DOMDocument("1.0");
26 26  
27 27 $DDsys->load($referXML);
... ... @@ -44,7 +44,7 @@
44 44  
45 45 function getVersion($dataSet)
46 46 {
47   - $referXML = baseDir."DDsys.xml";
  47 + $referXML = baseDir."/DDsys.xml";
48 48 $DDsys = new DOMDocument("1.0");
49 49 $DDsys->load($referXML);
50 50 $xp = new domxpath($DDsys);
... ... @@ -63,7 +63,7 @@
63 63  
64 64 function getTimeRestriction($dataSet)
65 65 {
66   - $referXML = baseDir."DDsys.xml";
  66 + $referXML = baseDir."/DDsys.xml";
67 67 $DDsys = new DOMDocument("1.0");
68 68 $DDsys->load($referXML);
69 69 $xp = new domxpath($DDsys);
... ... @@ -315,7 +315,7 @@
315 315 function getStartStop($dataSet)
316 316 {
317 317 if ($dataSet != "compound") {
318   - $referFile = baseDir."refer.nc";
  318 + $referFile = baseDir."/refer.nc";
319 319 $cmd = DDBASEBIN."/StartStop ".$referFile." ".$dataSet;
320 320 $res = system($cmd);
321 321  
... ... @@ -329,7 +329,7 @@
329 329  
330 330 function getInfo($dataSet, $infoID)
331 331 {
332   - $referFile = baseDir."refer.nc";
  332 + $referFile = baseDir."/refer.nc";
333 333 $cmd = DDBASEBIN."/GetInfo ".$referFile." ".$dataSet." ".$infoID;
334 334 $res = system($cmd);
335 335  
... ... @@ -408,7 +408,7 @@
408 408 $tempFile = uniqid("temp");
409 409 if (file_exists($tempFile)) unlink($tempFile);
410 410  
411   - $referXML = baseDir."DDsys.xml";
  411 + $referXML = baseDir."/DDsys.xml";
412 412 $DDsys = new DOMDocument("1.0");
413 413 $DDsys->load($referXML);
414 414 $xp = new domxpath($DDsys);
... ...