Fix merge conflit

Benjamin Renard
2 parents 25482292 40df211d
Showing 5 changed files with 106 additions and 4 deletions Show diff stats
generic_data/Functions/functions.xml
js/app/models/PlotObjects/PlotObjectConfig.js
php/classes/CatalogCacheIntervalObject.php
update_amda/correctNan.php
update_amda/remakeInfo.php
@@ -88,7 +88,7 @@
      <prompt/>
      <info_brief>GSE to SM transformation</info_brief>
    </function>-->
-   <function name="angle(,)" params="2" kind="vectors">
+   <function name="angle(,)" args="2" kind="vectors">
       <info_brief>Angle between two vectors</info_brief>
       <new_kernel>angle</new_kernel>
    </function>
@@ -333,7 +333,12 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
                    {'key' : '0', 'value' : 'Default'},
                    {'key' : '1', 'value' : 'Blue Red'},
                    {'key' : '2', 'value' : 'Blue Yellow'},
-                   {'key' : '3', 'value' : 'Grayscale'}
+                   {'key' : '3', 'value' : 'Grayscale'},
+                   {'key' : '4', 'value' : 'AMDA Default'},
+                   {'key' : '5', 'value' : 'GeoWhite'},
+                   {'key' : '6', 'value' : 'GeoBlack'},
+                   {'key' : '7', 'value' : 'Violet Yellow'},
+                   {'key' : '8', 'value' : 'Red Blue 4'}
 	],
  
 	availableColors : [
@@ -68,7 +68,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
 						}
 						break;
 					case 3: //int
-						fwrite($handle,pack('L', intval($value)));
+						fwrite($handle,pack('l', intval($value)));
 					  break;
 					default: // not defined => string
 					fwrite($handle,pack('L', strlen($value)));
@@ -121,7 +121,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
  
 						break;
 					case 3: //int
-						if (!$res = unpack('Lval',fread($handle,4))) {
+						if (!$res = unpack('lval',fread($handle,4))) {
 							break;
 						}
 						$val = $res['val'];
@@ -0,0 +1,38 @@
+<?php
+
+    define("AMDA_INTERNAL_METADATA",getenv("AMDAINTERNALDIR"));
+    
+    $info = new DomDocument("1.0");
+   // $infoName = $argv[1];
+    $pattern = "info_psp_loic_*.xml";
+    foreach (glob(AMDA_INTERNAL_METADATA."/PARAM_INFO_PREDEFINED/".$pattern) as $infoName) {
+        $info->load($infoName);
+        
+        $dimensions =  $info->getElementsByTagName("dimensions")->item(0);
+        
+        $dim_1 = $dimensions->getAttribute("dim_1");
+        $dim_2 = null;
+        if ($dimensions->hasAttribute("dim_2"))
+            $dim_2 = $dimensions->getAttribute("dim_2");
+        
+
+        $tables = $info->getElementsByTagName("table");
+        
+        foreach ($tables as $table) {
+            $channels = $table->getElementsByTagName("channel");
+            $dim = $table->getAttribute("relatedDim");
+            if ( $dim == "dim_1" ) $dim_ = $dim_1;
+            if ( $dim == "dim_2" ) $dim_ = $dim_2;
+            if ($dim_ != $channels->length) {
+                $dimensions->setAttribute($dim, $channels->length);
+                echo $infoName.PHP_EOL;
+                echo $dim_." ".$channels->length.PHP_EOL;
+            }
+        }
+        $info->save($infoName);
+    }
+
+?>
+
+
+
@@ -0,0 +1,59 @@
+<?php
+
+    function remove_children(&$node) {
+        while ($node->firstChild) {
+            while ($node->firstChild->firstChild) {
+                remove_children($node->firstChild);
+            }
+            $node->removeChild($node->firstChild);
+        }
+    }
+     
+    define("NEWMETA",getenv("NEWMETA"));
+    define("AMDA_INTERNAL_METADATA",getenv("AMDAINTERNALDIR"));
+    
+    $pattern = "info_psp_om*.xml";
+    $info = new DomDocument("1.0");
+    
+   // $infoName = $argv[1];
+    foreach (glob(NEWMETA."/ParamInfo/".$pattern) as $infoName) {
+        
+        $info->load($infoName);
+        $dimensions =  $info->getElementsByTagName("dimensions")->item(0);
+        
+        if ($dimensions->hasAttribute("dim_2") &&  $dimensions->getAttribute("dim_2") == "1")
+                $dimensions->removeAttribute("dim_2");
+                
+        $components = $info->getElementsByTagName("components");
+        if ($components->length == 0) continue;
+        if ( !$components->item(0)->hasChildNodes() ) continue; // has been already processed
+        $a=$components->item(0);
+        remove_children($a);
+        
+        $channels = $info->getElementsByTagName("channel");
+        foreach ($channels as $channel) {
+            $min = $channel->getAttribute("min");
+            $max = $channel->getAttribute("max");
+            
+            if ( $min == "nan" ) {
+                $channel->setAttribute("min", "-");
+            }
+            if ( $max== "nan" ) {
+                $channel->setAttribute("max", "-");
+            }
+            if (is_numeric($min)) 
+                $channel->setAttribute("min",number_format($min,1,".",""));
+            if (is_numeric($max)) 
+                $channel->setAttribute("max",number_format($max,1,".",""));
+            
+        }
+        echo basename($infoName).PHP_EOL;
+        $info->save(AMDA_INTERNAL_METADATA."/PARAM_INFO_PREDEFINED/".basename($infoName));
+    }
+    
+?>
+
+
+
+
+