From 9d2f7fc909d50f0252534be9c3cf7355c79b42ee Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 2 Jun 2020 18:45:56 +0200
Subject: [PATCH] correction in utils
---
src/DDSERVICES/REST/utils/generateGranulesIndex.php | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/DDSERVICES/REST/utils/generateGranulesIndex.php b/src/DDSERVICES/REST/utils/generateGranulesIndex.php
index 52e2e0e..2f09adb 100644
--- a/src/DDSERVICES/REST/utils/generateGranulesIndex.php
+++ b/src/DDSERVICES/REST/utils/generateGranulesIndex.php
@@ -5,30 +5,21 @@
* @version $Id: $
*/
- define('BASE','/data/DDBASE/');
-
- require_once BASE.'DDService/DDserverWeb_ini.php';
-
- if (!getenv('DDBASE'))
- define('DDBASE', BASE.'DATA');
- else
- define('DDBASE', getenv('DDBASE'));
+ require_once '../DDserverWeb_ini.php';
$ddSys = new DOMDocument('1.0');
- $ddSys->load(DDBASE.'/DDsys.xml');
+ $ddSys->load(baseDir.'/DDsys.xml');
$dataSets = $ddSys->getElementsByTagName('VI');
foreach ($dataSets as $VI)
{
- $vi_ = $VI->getElementsByTagName("NAME")->item(0);
- // only local bases
- if ($vi_->getAttribute("base") != "LOCAL") continue;
- $id = $vi_->nodeValue;
-
+ $id = $VI->getElementsByTagName('NAME')->item(0)->nodeValue;
$main = array();
$index = array();
- $location = $VI->getElementsByTagName("LOCATION")->item(0)->nodeValue;
-
+ $location = $VI->getElementsByTagName("LOCATION")->item(0)->nodeValue;
+
+ if (file_exists($location."RestrictedAccess")) continue; // PrivateAccess
+
foreach (glob($location."*.nc.gz") as $granule)
{
$cmd = 'stat --printf="%s" '. $granule;
@@ -36,7 +27,9 @@
$index[$file] = exec($cmd);
}
- $main[substr($location,strlen(DDBASE))] = $index;
- file_put_contents(BASE."GRANULES/$id.json", json_encode($main));
- }
+ $main[substr($location,strlen(baseDir))] = $index;
+ file_put_contents("../GRANULES/$id.json", json_encode($main));
+
+ }
+
?>
--
libgit2 0.21.2