Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug in metadata file regeneration fixed.

Browse source
This commit is contained in:
tomash 2005-09-29 22:25:32 +00:00
parent 4750fba2c4
commit 0a05c655e6
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
livesupport/modules/storageServer/var/MetaData.php
View file

@ -249,9 +249,9 @@ class MetaData{
$parname = ($parns ? "$parns:" : '').$parname; $parname = ($parns ? "$parns:" : '').$parname;
$category = ($chns ? "$chns:" : '').$chname; $category = ($chns ? "$chns:" : '').$chname;
$r = $this->validateOneValue($parname, $category, $predxml, $value); $r = $this->validateOneValue($parname, $category, $predxml, $value);
foreach(array('value') as $v) $$v = addslashes($$v);
if(PEAR::isError($r)) return $r; if(PEAR::isError($r)) return $r;
if(!is_null($value)){ if(!is_null($value)){
foreach(array('value') as $v) $$v = addslashes($$v);
$sql = " $sql = "
UPDATE {$this->mdataTable} UPDATE {$this->mdataTable}
SET object='$value', objns='_L' SET object='$value', objns='_L'
@ -646,9 +646,9 @@ class MetaData{
*/ */
function updateRecord($mdid, $object, $objns='_L') function updateRecord($mdid, $object, $objns='_L')
{ {
foreach(array('objns', 'object') as $v) $$v = addslashes($$v); foreach(array('objns', 'object') as $v){
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" ); ${$v."_sql"} = (is_null($$v) ? "NULL" : "'".addslashes($$v)."'" );
$object_sql = (is_null($object)? "NULL" : "'$object'"); }
$res = $this->dbc->query("UPDATE {$this->mdataTable} $res = $this->dbc->query("UPDATE {$this->mdataTable}
SET objns = $objns_sql, object = $object_sql SET objns = $objns_sql, object = $object_sql
WHERE gunid = x'{$this->gunid}'::bigint AND id='$mdid' WHERE gunid = x'{$this->gunid}'::bigint AND id='$mdid'
@ -678,12 +678,11 @@ class MetaData{
//echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n"; //echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n";
//$predns = strtolower($predns); //$predns = strtolower($predns);
//$predicate = strtolower($predicate); //$predicate = strtolower($predicate);
foreach( foreach(array(
array('subjns', 'subject', 'predns', 'predicate', 'objns', 'object' 'subjns', 'subject', 'predns', 'predicate', 'objns', 'object',
) as $v) $$v = addslashes($$v); ) as $v){
$predns_sql = (is_null($predns) ? "NULL" : "'$predns'" ); ${$v."_sql"} = (is_null($$v) ? "NULL" : "'".addslashes($$v)."'" );
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" ); }
$object_sql = (is_null($object)? "NULL" : "'$object'");
$id = $this->dbc->nextId("{$this->mdataTable}_id_seq"); $id = $this->dbc->nextId("{$this->mdataTable}_id_seq");
if(PEAR::isError($id)) return $id; if(PEAR::isError($id)) return $id;
$res = $this->dbc->query(" $res = $this->dbc->query("
@ -693,8 +692,8 @@ class MetaData{
objns , object objns , object
) )
VALUES VALUES
($id, x'{$this->gunid}'::bigint, '$subjns', '$subject', ($id, x'{$this->gunid}'::bigint, $subjns_sql, $subject_sql,
$predns_sql, '$predicate', '$predxml', $predns_sql, $predicate_sql, '$predxml',
$objns_sql, $object_sql $objns_sql, $object_sql
) )
"); ");
@ -808,8 +807,8 @@ class MetaData{
'localPart' => $predicate, 'localPart' => $predicate,
'attributes'=> $attrs, 'attributes'=> $attrs,
'content' => (is_null($object) ? $children : $object), 'content' => (is_null($object) ? $children : $object),
# 'content' => (is_null($object) ? $children : htmlentities($object, ENT_COMPAT, 'UTF-8')),
), FALSE); ), FALSE);
// 'content' => (is_null($object) ? $children : htmlentities($object, ENT_COMPAT, 'UTF-8')),
}else{ }else{
$node = array_merge( $node = array_merge(
array( array(
@ -857,12 +856,12 @@ class MetaData{
switch($predxml){ switch($predxml){
case"N": case"N":
$nSpaces["$predicate"] = $object; $nSpaces["$predicate"] = $object;
# $nSpaces["$predicate"] = htmlentities($object, ENT_COMPAT, 'UTF-8'); // $nSpaces["$predicate"] = htmlentities($object, ENT_COMPAT, 'UTF-8');
case"A": case"A":
$sep=':'; $sep=':';
if($predns=='' || $predicate=='') $sep=''; if($predns=='' || $predicate=='') $sep='';
$attrs["{$predns}{$sep}{$predicate}"] = $object; $attrs["{$predns}{$sep}{$predicate}"] = $object;
# $attrs["{$predns}{$sep}{$predicate}"] = htmlentities($object, ENT_COMPAT, 'UTF-8'); // $attrs["{$predns}{$sep}{$predicate}"] = htmlentities($object, ENT_COMPAT, 'UTF-8');
break; break;
case"T": case"T":
$children[] = $this->genXMLNode($row, $genXML); $children[] = $this->genXMLNode($row, $genXML);