Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 267 → Rev 319

/belle2/masterclass/runscript.php
42,11 → 42,13
}
if($node->hasChildNodes()) {
if (!$node->childNodes->item(0)->hasChildNodes() ||
strpos($node->nodeName,"list")!==false ||
$node->nodeName === "histogram" ) {
strpos($node->nodeName,"list")!==false
// || $node->nodeName === "histogram"
) {
$str .= parseDOMNode($node);
} else {
$str .= $node->nodeName.'(' ;
if ( $node->nodeName === "histogram") $str .= $node->childNodes->length . ',' ;
$str .= parseDOMNode($node);
$str .= ') ' ;
}
137,7 → 139,10
if ($len>0){
$out= fread($pipe, $len);
if ($id == 3){
stat2db($out);
$hostname = gethostname();
if ($hostname == "belle2.ijs.si") {
stat2db($out);
}
// $out = $_SERVER['REMOTE_ADDR'] . ";" .$out ;
// $retval = system("echo '$out' >> public/blab2stat.txt ");
// $out .= ";" . $retval;
165,7 → 170,13
}
 
 
function removeTrailingCommas($json)
{
$json=preg_replace('/,\s*([\]}])/m', '$1', $json);
return $json;
}
 
 
$code="";
if (PHP_SAPI === 'cli') {
$code = $argv[1];
175,8 → 186,20
}
}
 
$code = removeTrailingCommas($code);
//send_message(0,"$code",0);
 
$data = json_decode($code, true);
 
 
$ierr =json_last_error();
if (json_last_error() != JSON_ERROR_NONE) {
send_message(0,"JSON Error $ierr ! cannot convert...",0);
send_message('CLOSE', "Stopping...",100);
}
 
 
 
$neve = $data['analysis']['neve'];
$first = $data['analysis']['first'];
$evprint = $data['analysis']['print'];
185,12 → 208,12
$xml = '<?xml version="1.0" encoding="utf-8"?>' . xmlWalker($data,'start');
$dom = new DOMDocument;
$dom->loadXML($xml);
 
 
/*
echo "<pre>";
echo $dom->saveXML();
echo "</pre>";
echo PHP_EOL;
*/
 
$cnt=0;
 
244,11 → 267,12
}
//$isEmpty = $elem->childNodes->length === 0;
 
/*
echo "<pre>";
echo $dom->saveXML();
echo "</pre>";
 
echo PHP_EOL;
*/
 
$str="";
foreach ($dom->getElementsByTagName('analysis') as $node){