Commit 1e4e16dc6f8175d4b902c703b3845453b73659d8
1 parent
3197b3e2
Exists in
master
and in
111 other branches
exclude old Parser and unneeded procedures
Showing
3 changed files
with
10 additions
and
32 deletions
Show diff stats
php/classes/AmdaStats.php
| ... | ... | @@ -160,15 +160,15 @@ class AmdaStats { |
| 160 | 160 | $ID[] = 'uploadedData'; |
| 161 | 161 | } |
| 162 | 162 | // if derived parameter parse it |
| 163 | - elseif (substr($var, 0, 3) == 'ws_') { | |
| 164 | - | |
| 165 | - if (!$parser) $parser = new Parser(); | |
| 166 | - $realVar = $parser->replaceAll($var); | |
| 167 | - $varArr = $parser->getVars($realVar); | |
| 168 | - foreach ($varArr as $var) { | |
| 169 | - $ID[] = $this->getInfo($var); | |
| 170 | - } | |
| 171 | - } | |
| 163 | +// elseif (substr($var, 0, 3) == 'ws_') { | |
| 164 | +// | |
| 165 | +// if (!$parser) $parser = new Parser(); | |
| 166 | +// $realVar = $parser->replaceAll($var); | |
| 167 | +// $varArr = $parser->getVars($realVar); | |
| 168 | +// foreach ($varArr as $var) { | |
| 169 | +// $ID[] = $this->getInfo($var); | |
| 170 | +// } | |
| 171 | +// } | |
| 172 | 172 | else { |
| 173 | 173 | $ID[] = $this->getInfo($var); |
| 174 | 174 | } |
| ... | ... |
php/classes/DerivedParamMgr.php
| ... | ... | @@ -91,25 +91,6 @@ |
| 91 | 91 | $this->contentDom->appendChild($rootElement); |
| 92 | 92 | $this->contentDom->save($this->xmlName); |
| 93 | 93 | } |
| 94 | -/* | |
| 95 | -* Internal resource file used by DD applications | |
| 96 | -*/ | |
| 97 | - protected function createObjectResource($obj){ | |
| 98 | -// Parse : get real vars | |
| 99 | - $myParser = new Parser(); | |
| 100 | - $theChain = $obj->buildchain; | |
| 101 | - $newChain = $myParser->replaceAllButWS($theChain); | |
| 102 | - $realVars = $myParser->getVars($newChain); | |
| 103 | - | |
| 104 | - $theTimeStep = $obj->timestep; | |
| 105 | -// Write stuff into internal res file | |
| 106 | - | |
| 107 | - $fd=fopen($this->resFileName, "w"); | |
| 108 | - foreach ($realVars as $theVar) fprintf($fd, "%s ", $this->param2dd($theVar)); | |
| 109 | - fprintf($fd, "\n%s\n", $theTimeStep); | |
| 110 | - fclose($fd); | |
| 111 | - } | |
| 112 | - | |
| 113 | 94 | |
| 114 | 95 | /* |
| 115 | 96 | * rename PARAM in id.xml |
| ... | ... | @@ -171,8 +152,7 @@ |
| 171 | 152 | $p->buildchain = $this->resetAlias($p->buildchain); |
| 172 | 153 | } |
| 173 | 154 | // switch between myData and Derived |
| 174 | - $this -> resFileName = USERWORKINGDIR.$this->id.'.res'; | |
| 175 | - $this -> createObjectResource($p); | |
| 155 | + $this -> resFileName = USERWORKINGDIR.$this->id.'.res'; | |
| 176 | 156 | $this -> createObjectDescription($p); |
| 177 | 157 | $this -> addToContent($p, $folder); |
| 178 | 158 | return array('id' => $this->id, 'info' => $p->buildchain); |
| ... | ... |
php/classes/RequestMgr.php