CDPP / AMDA_IHM

Commit 23fba7a91cfb588dd54a337a86d5c55b16de911f

Authored by Elena.Budnik
1 parent 0cb6a7aa
Exists in master and in 109 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

no temp file for CdfSampling

Showing 3 changed files with 18 additions and 12 deletions   Show diff stats
Inline Side-by-side
php/classes/FilesMgr.php
  Diff comments   View file @23fba7a
... ... @@ -120,19 +120,13 @@ class FilesMgr extends AmdaObjectMgr
120 120 return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs, 'units' => $units, 'fillvalue' => $fillval);
121 121 }
122 122  
123   - public function getCdfSampling() {
124   - copy($this->fileName, "temp.cdf");
125   - exec('cdfsamplingfromdata ', $results);
126   - unlink("temp.cdf");
127   -
  123 + public function getCdfSampling() {
  124 + exec('cdfsamplingfromdata '.$this->fileName, $results);
128 125 return $results;
129 126 }
130 127  
131   - public function getCdfSamplings() {
132   - copy($this->fileName, "temp.cdf");
133   - exec('cdfsamplingsfromdata ', $results);
134   - unlink("temp.cdf");
135   -
  128 + public function getCdfSamplings() {
  129 + exec('cdfsamplingsfromdata '.$this->fileName, $results);
136 130 return $results;
137 131 }
138 132 /*
... ...
php/src/cdfsamplingfromdata.c
  Diff comments   View file @23fba7a
... ... @@ -7,7 +7,7 @@
7 7 #include <time.h>
8 8 #include <math.h>
9 9  
10   -#define fileName "temp.cdf"
  10 +#define MAX_FILE_NAME_LEN 120
11 11 #define badFile -100
12 12  
13 13 /*************************************
... ... @@ -45,6 +45,7 @@ void cdf_handle_error(CDFstatus status)
45 45  
46 46 int main(int argc, char *argv[])
47 47 {
  48 + char fileName[MAX_FILE_NAME_LEN];
48 49 long RecStart = 0, RecCount = 2, RecInt = 1;
49 50 long indices[1] = {0}, intervals[1] = {1}, counts[1] = {1};
50 51 long varN = -1;
... ... @@ -58,6 +59,11 @@ int main(int argc, char *argv[])
58 59 double epoch16[2], dbl_value, dbl_value_;
59 60 long year, month, day, hour, minute, sec, msec, mksec, nsec, psec;
60 61 long long *int_value;
  62 +
  63 + if (argc <= 1)
  64 + exit(0); /* CDF input file name not specified */
  65 + else
  66 + strcpy(fileName, argv[argc-1]); /* Get the input file name */
61 67  
62 68 /*********************** Open CDF file *****************************/
63 69 if ((cstatus = CDFopen(fileName, &id)) != CDF_OK)
... ...
php/src/cdfsamplingsfromdata.c
  Diff comments   View file @23fba7a
... ... @@ -10,7 +10,7 @@
10 10 #include <time.h>
11 11 #include <math.h>
12 12  
13   -#define fileName "temp.cdf"
  13 +#define MAX_FILE_NAME_LEN 120
14 14 #define badFile -100
15 15  
16 16 /*************************************
... ... @@ -76,6 +76,7 @@ void find_min(int* delta, int nRecs, int minFalse, int* minVal)
76 76  
77 77 int main(int argc, char *argv[])
78 78 {
  79 + char fileName[MAX_FILE_NAME_LEN];
79 80 long RecStart = 0, RecCount, RecInt = 1;
80 81 long indices[1] = {0}, intervals[1] = {1}, counts[1] = {1};
81 82 long varN = -1;
... ... @@ -91,6 +92,11 @@ int main(int argc, char *argv[])
91 92 double epoch16[2], dbl_value, dbl_value_;
92 93 long year, month, day, hour, minute, sec, msec, mksec, nsec, psec;
93 94 long long *int_value;
  95 +
  96 + if (argc <= 1)
  97 + exit(0); /* CDF input file name not specified */
  98 + else
  99 + strcpy(fileName, argv[argc-1]); /* Get the input file name */
94 100  
95 101 /*********************** Open CDF file *****************************/
96 102 if ((cstatus = CDFopen(fileName, &id)) != CDF_OK)
... ...