| Index: trunk/extensions/RDFIO/stores/SMW_ARC2Store.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | */ |
| 56 | 56 | function updateData( SMWSemanticData $data ) { |
| 57 | 57 | $export = SMWExporter::makeExportData( $data ); |
| 58 | | - $subject_uri = SMWExporter::expandURI( $export->getSubject()->getName() ); |
| | 58 | + $subject_uri = SMWExporter::expandURI( $export->getSubject()->getUri() ); |
| 59 | 59 | |
| 60 | 60 | // remove subject from triple store |
| 61 | 61 | $this->removeDataForURI( $subject_uri ); |
| — | — | @@ -74,19 +74,20 @@ |
| 75 | 75 | $pre_str = ""; |
| 76 | 76 | |
| 77 | 77 | if ( $object instanceof SMWExpLiteral ) { |
| 78 | | - $obj_str = "\"" . $object->getName() . "\"" . ( ( $object->getDatatype() == "" ) ? "" : "^^<" . $object->getDatatype() . ">" ); |
| | 78 | + // @todo FIXME: Add escaping for results of getLexicalForm()? |
| | 79 | + $obj_str = "\"" . $object->getLexicalForm() . "\"" . ( ( $object->getDatatype() == "" ) ? "" : "^^<" . $object->getDatatype() . ">" ); |
| 79 | 80 | } elseif ( $object instanceof SMWExpResource ) { |
| 80 | | - $obj_str = "<" . SMWExporter::expandURI( $object->getName() ) . ">"; |
| | 81 | + $obj_str = "<" . SMWExporter::expandURI( $object->getUri() ) . ">"; |
| 81 | 82 | } else { |
| 82 | 83 | $obj_str = "\"\""; |
| 83 | 84 | } |
| 84 | 85 | |
| 85 | 86 | if ( $subject instanceof SMWExpResource ) { |
| 86 | | - $sub_str = "<" . SMWExporter::expandURI( $subject->getName() ) . ">"; |
| | 87 | + $sub_str = "<" . SMWExporter::expandURI( $subject->getUri() ) . ">"; |
| 87 | 88 | } |
| 88 | 89 | |
| 89 | 90 | if ( $predicate instanceof SMWExpResource ) { |
| 90 | | - $pre_str = "<" . SMWExporter::expandURI( $predicate->getName() ) . ">"; |
| | 91 | + $pre_str = "<" . SMWExporter::expandURI( $predicate->getUri() ) . ">"; |
| 91 | 92 | } |
| 92 | 93 | |
| 93 | 94 | $sparqlUpdateText .= $sub_str . " " . $pre_str . " " . $obj_str . " .\n"; |
| — | — | @@ -224,7 +225,7 @@ |
| 225 | 226 | $dv = SMWDataValueFactory::newTypeIDValue( '_wpg' ); |
| 226 | 227 | $dv->setTitle( $title ); |
| 227 | 228 | $exp = $dv->getExportData(); |
| 228 | | - $uri = $exp->getSubject()->getName(); |
| | 229 | + $uri = $exp->getSubject()->getUri(); |
| 229 | 230 | } else { |
| 230 | 231 | // There could be other types as well that we do NOT handle here |
| 231 | 232 | } |