From 3630cf462b13d6aafd7f62d46423dad5e92bbd9e Mon Sep 17 00:00:00 2001 From: icewing Date: Tue, 20 May 2008 11:41:23 +0000 Subject: Marcus Povey * reverted previous git-svn-id: https://code.elgg.org/elgg/trunk@658 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/atom.php | 170 ------------------------------------ engine/lib/export.php | 4 +- engine/lib/opendd.php | 47 +--------- views/atom/export/entity.php | 17 ---- views/atom/export/metadata.php | 21 ----- views/atom/export/relationship.php | 21 ----- views/atom/pageshells/pageshell.php | 16 ---- 7 files changed, 4 insertions(+), 292 deletions(-) delete mode 100644 engine/lib/atom.php delete mode 100644 views/atom/export/entity.php delete mode 100644 views/atom/export/metadata.php delete mode 100644 views/atom/export/relationship.php delete mode 100644 views/atom/pageshells/pageshell.php diff --git a/engine/lib/atom.php b/engine/lib/atom.php deleted file mode 100644 index 684ae0946..000000000 --- a/engine/lib/atom.php +++ /dev/null @@ -1,170 +0,0 @@ -\n"; - $wrapped .= "".urlencode(current_page_url())."\n"; - $wrapped .= "".date(DATE_ATOM)."\n"; - $wrapped .= "".$_SESSION['user']->name."\n"; - $wrapped .= "OpenDD-over-Atom feed\n"; - - // Itterate - foreach ($element as $e) - { - $wrapper = $factory->getElementWrapper($e); - $wrapped .= $wrapper->wrap($e); - } - - // Tail - $wrapped .= "\n"; - - return $wrapped; - } - } - - /** - * Atom entity wrapper - */ - class ODDAtomEntityWrapper extends ODDEntityWrapper - { - function wrap($element) - { - $wrapped = ""; - - // Sanity check - if (!($element instanceof ODDEntity)) - throw new DataFormatException("Element being wrapped is not an ODDEntity"); - - $wrapped .= "\n"; - - $wrapped .= "".$element->getAttribute('uuid')."?view=atom"."\n"; - $wrapped .= "".date(DATE_ATOM)."\n"; - $wrapped .= "Entity\n"; - $wrapped .= "".$_SESSION['user']->name."\n"; - - $wrapped .= "\n"; - $wrapped .= "$element\n"; - $wrapped .= "\n"; - - $wrapped .= "\n"; - - return $wrapped; - } - - } - - /** - * Atom metadata wrapper - */ - class ODDAtomMetaDataWrapper extends ODDMetaDataWrapper - { - function wrap($element) - { - $wrapped = ""; - - // Sanity check - if (!($element instanceof ODDMetaData)) - throw new DataFormatException("Element being wrapped is not an ODDMetaData"); - - $wrapped .= "\n"; - - $wrapped .= "".$element->getAttribute('uuid')."?view=atom"."\n"; - $wrapped .= "".date(DATE_ATOM)."\n"; - $wrapped .= "Entity\n"; - $wrapped .= "".$_SESSION['user']->name."\n"; - - $wrapped .= "\n"; - $wrapped .= "$element\n"; - $wrapped .= "\n"; - - $wrapped .= "\n"; - - return $wrapped; - } - } - - /** - * Atom Relationship wrapper. - */ - class ODDAtomRelationshipWrapper extends ODDRelationshipWrapper - { - function wrap($element) - { - $wrapped = ""; - - // Sanity check - if (!($element instanceof ODDRelationship)) - throw new DataFormatException("Element being wrapped is not an ODDRelationship"); - - $wrapped .= "\n"; - - $wrapped .= "\n"; - $wrapped .= "".date(DATE_ATOM)."\n"; - $wrapped .= "Entity\n"; - $wrapped .= "".$_SESSION['user']->name."\n"; - - $wrapped .= "\n"; - $wrapped .= "$element\n"; - $wrapped .= "\n"; - - $wrapped .= "\n"; - - return $wrapped; - } - } -?> \ No newline at end of file diff --git a/engine/lib/export.php b/engine/lib/export.php index 815fc5819..4953fab91 100644 --- a/engine/lib/export.php +++ b/engine/lib/export.php @@ -164,7 +164,7 @@ * @param ODDWrapperFactory $wrapper Optional wrapper permitting the export process to embed ODD in other document formats. * @return xml */ - function export($guid, ODDWrapperFactory $wrapper = null) + function export($guid) { $guid = (int)$guid; @@ -179,7 +179,7 @@ $odd = new ODDDocument($to_be_serialised); - return ODD_Export($odd, $wrapper); + return ODD_Export($odd); } /** diff --git a/engine/lib/opendd.php b/engine/lib/opendd.php index 96c18bbea..60707f43f 100644 --- a/engine/lib/opendd.php +++ b/engine/lib/opendd.php @@ -6,7 +6,7 @@ * @subpackage Core * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 * @author Marcus Povey - * @version 0.3 + * @version 0.2 * @copyright Curverider Ltd 2008 * @link http://elgg.org/ */ @@ -269,46 +269,6 @@ protected function getTagName() { return "relationship"; } } - /** - * A wrapper factory is used to construct the appropriate wrappers that permit ODD documents to be embedded - * as a payload in other formats. - */ - abstract class ODDWrapperFactory - { - abstract function getElementWrapper($element); - } - - /** - * Element wrapper superclass. - */ - abstract class ODDWrapper - { - /** - * Wrap an element and return the encoded string. - */ - abstract function wrap($element); - } - - /** - * Document wrapper superclass - */ - abstract class ODDDocumentWrapper extends ODDWrapper { } - - /** - * Entity wrapper superclass - */ - abstract class ODDEntityWrapper extends ODDWrapper { } - - /** - * Metadata wrapper superclass - */ - abstract class ODDMetaDataWrapper extends ODDWrapper { } - - /** - * Relationship wrapper superclass. - */ - abstract class ODDRelationshipWrapper extends ODDWrapper { } - /** * Attempt to construct an ODD object out of a XmlElement or sub-elements. * @@ -373,11 +333,8 @@ * @param ODDDocument $document The Document. * @param ODDWrapperFactory $wrapper Optional wrapper permitting the export process to embed ODD in other document formats. */ - function ODD_Export(ODDDocument $document, ODDWrapperFactory $wrapper = null) + function ODD_Export(ODDDocument $document) { - if ($wrapper) - $document->setWrapperFactory($wrapper); - return "$document"; } diff --git a/views/atom/export/entity.php b/views/atom/export/entity.php deleted file mode 100644 index c89a73fc4..000000000 --- a/views/atom/export/entity.php +++ /dev/null @@ -1,17 +0,0 @@ -guid, new ODDAtomWrapperFactory()); -?> \ No newline at end of file diff --git a/views/atom/export/metadata.php b/views/atom/export/metadata.php deleted file mode 100644 index 2c943cd4d..000000000 --- a/views/atom/export/metadata.php +++ /dev/null @@ -1,21 +0,0 @@ -addElement($m->export()); - $odd->setWrapperFactory(new ODDAtomWrapperFactory()); - - echo $odd; -?> \ No newline at end of file diff --git a/views/atom/export/relationship.php b/views/atom/export/relationship.php deleted file mode 100644 index d0ad62385..000000000 --- a/views/atom/export/relationship.php +++ /dev/null @@ -1,21 +0,0 @@ -addElement($r->export()); - $odd->setWrapperFactory(new ODDAtomWrapperFactory()); - - echo $odd; -?> \ No newline at end of file diff --git a/views/atom/pageshells/pageshell.php b/views/atom/pageshells/pageshell.php deleted file mode 100644 index f5c7a4ce0..000000000 --- a/views/atom/pageshells/pageshell.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file -- cgit v1.2.3