From 46fc19c79fcd51bfdd86642bbdea7b2910a59a23 Mon Sep 17 00:00:00 2001 From: icewing Date: Wed, 30 Apr 2008 15:22:41 +0000 Subject: Marcus Povey * Changed "verb" to "type" in relationship, as described in ODD spec 0.5 git-svn-id: https://code.elgg.org/elgg/trunk@582 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/export.php | 47 ++--------------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'engine/lib/export.php') diff --git a/engine/lib/export.php b/engine/lib/export.php index 3eb22aba2..a44160758 100644 --- a/engine/lib/export.php +++ b/engine/lib/export.php @@ -242,12 +242,12 @@ */ class ODDRelationship extends ODD { - function __construct($uuid1, $verb, $uuid2) + function __construct($uuid1, $type, $uuid2) { parent::__construct(); $this->setAttribute('uuid1', $uuid1); - $this->setAttribute('verb', $verb); + $this->setAttribute('type', $type); $this->setAttribute('uuid2', $uuid2); } @@ -286,49 +286,6 @@ return $odd; } - /** Relationship verb mapping */ - $ODD_RELATIONSHIP_VERBS = array(); - - /** - * This function provides a mapping between entity relationships and ODD relationship verbs. - * @param string $relationship The relationship as stored in the database, eg "friend" or "member of" - * @param string $verb The verb, eg "friends" or "joins" - */ - function register_odd_relationship_mapping($relationship, $verb) - { - global $ODD_RELATIONSHIP_VERBS; - - $ODD_RELATIONSHIP_VERBS[$relationship] = $verb; - } - - /** - * Return a mapping for relationship to a pre-registered ODD verb, or false. - * @param string $relationship The relationship - */ - function get_verb_from_relationship($relationship) - { - global $ODD_RELATIONSHIP_VERBS; - - if (isset($ODD_RELATIONSHIP_VERBS[$relationship])) - return $ODD_RELATIONSHIP_VERBS[$relationship]; - - return false; - } - - /** - * Return the relationship registered with a given verb, or false. - * @param string $verb The verb. - */ - function get_relationship_from_verb($verb) - { - global $ODD_RELATIONSHIP_VERBS; - - foreach ($ODD_RELATIONSHIP_VERBS as $k => $v) - if ($v == $verb) return $k; - - return false; - } - /** * Generate a UUID from a given GUID. * -- cgit v1.2.3