[ODP-Repository] SF.net SVN: opendocumentphp: [20] poc

[<nma...@us...>]

Revision: 20
Author:   nmarkgraf
Date:     2006-03-13 00:58:48 -0800 (Mon, 13 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opendocumentphp/?rev=20&view=rev

Log Message:
-----------
Only a few bug fixes:

- build.xml was updated to run only on non-samples.
- all test needs to be in an new subpackage
- minor things in FontFaceDeclaration and OpenDocumentSingle class.

:D Norman

Modified Paths:
--------------
    poc/build.xml
    poc/src/OpenDocumentFactoryTest.php
    poc/src/OpenDocumentManifestTest.php
    poc/src/OpenDocumentMeta.php
    poc/src/OpenDocumentMetaTest.php
    poc/src/OpenDocumentObjectAbstract.php
    poc/src/OpenDocumentSingle.php
    poc/src/styles/FontFaceDeclaration.php
Modified: poc/build.xml
===================================================================
--- poc/build.xml	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/build.xml	2006-03-13 08:58:48 UTC (rev 20)
@@ -23,6 +23,7 @@
 			<fileset dir="src">
 				<include name="**/*.php"/>
 				<exclude name="**/*Test.php"/>
+				<exclude name="**/samples/*.php"/>
 			</fileset>
 		</coverage-setup>
 		

Modified: poc/src/OpenDocumentFactoryTest.php
===================================================================
--- poc/src/OpenDocumentFactoryTest.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentFactoryTest.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -5,7 +5,8 @@
  * @copyright GNU General Public License
  * @author    Norman Markgraf <nma...@us...>
  * @version   $Revision$
- * @package   OpenDocumentTest
+ * @package   OpenDocument
+ * @subpackage UnitTest
  *
  * $Id$
  */

Modified: poc/src/OpenDocumentManifestTest.php
===================================================================
--- poc/src/OpenDocumentManifestTest.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentManifestTest.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -6,7 +6,8 @@
  * @lecense   GNU General Public License
  * @author    Norman Markgraf <nma...@us...>
  * @version   $Revision$
- * @package   OpenDocumentUnitTest
+ * @package   OpenDocument
+ * @subpackage UnitTest
  *
  * @since 0.4.0
  *

Modified: poc/src/OpenDocumentMeta.php
===================================================================
--- poc/src/OpenDocumentMeta.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentMeta.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -24,7 +24,7 @@
    *
    * @since 0.3.0
    */
-  public function __construct( $dom=0, $root=0 ) {
+  public function __construct( $dom=0, $_root=0 ) {
     parent::__construct();
 
     $this->logger->debug( "Constructing OpenDocumentMeta." );
@@ -39,11 +39,10 @@
       
 	  $this->dom->appendChild( $node );
 	  $this->meta = $node;
-	  unset( $node ); 
 	} else {
 	  // this is part of a single document
 	  $this->dom = $dom;	  
-	  $this->meta = $root;
+	  $this->meta = $_root;
 	}
     $this->root = $this->dom->createElementNS( self::NS_OFFICE, "office:meta" );    
   }

Modified: poc/src/OpenDocumentMetaTest.php
===================================================================
--- poc/src/OpenDocumentMetaTest.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentMetaTest.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -5,7 +5,8 @@
  * @copyright GNU General Public License
  * @author    Norman Markgraf <nma...@us...>
  * @version   $Revision$
- * @package   OpenDocumentUnitTest
+ * @package   OpenDocument
+ * @subpackage UnitTest
  *
  * $Id$
  */
@@ -21,7 +22,7 @@
           /**
 		   * namespace Dublin Core
 		   */
-		const NS_DC     = "http://purl.org/dc/elements/1.1";
+		const NS_DC     = "http://purl.org/dc/elements/1.1/";
 	        
     	public function testConstructWithoutDom(){
 		  $ODM = new OpenDocumentMeta();
@@ -58,8 +59,11 @@
 		
     	public function testConstructWithDom(){
     	  $testDom = new DOMDocument();
+    	  $node = $testDom->createElementNS( self::NS_OFFICE, "office:meta" );
     	  
-    	  $ODM = new OpenDocumentMeta( $testDom );
+    	  $ODM = new OpenDocumentMeta( $testDom, $node );
+      	  $testDom->appendChild( $node );
+      	  
 		  $this->assertNotNull( $ODM );
 
     	  $resultDom = $ODM->get();

Modified: poc/src/OpenDocumentObjectAbstract.php
===================================================================
--- poc/src/OpenDocumentObjectAbstract.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentObjectAbstract.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -86,19 +86,9 @@
   const NS_ANIM = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0";  
   
   /**
-   * namespace OpenDocument chart
-   */
-  const NS_CHART = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0";  
-
-  /**
    * namespace OpenDocument script
    */
   const NS_SCRIPT = "urn:oasis:names:tc:opendocument:xmlns:script:1.0";  
-
-  /**
-   * namespace OpenDocument number
-   */
-  const NS_NUMBER = "urn:oasis:names:tc:opendocument:xmlns:number:1.0";  
   
   /**
    * namespace OpenDocument svg

Modified: poc/src/OpenDocumentSingle.php
===================================================================
--- poc/src/OpenDocumentSingle.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/OpenDocumentSingle.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -18,6 +18,11 @@
   private $dom;
   private $root;
   
+  /**
+   * namespace OpenDocument office
+   */
+  const NS_OFFICE = "urn:oasis:names:tc:opendocument:xmlns:office:1.0";
+  
  /**
   *
   * @access public

Modified: poc/src/styles/FontFaceDeclaration.php
===================================================================
--- poc/src/styles/FontFaceDeclaration.php	2006-03-13 08:14:08 UTC (rev 19)
+++ poc/src/styles/FontFaceDeclaration.php	2006-03-13 08:58:48 UTC (rev 20)
@@ -82,7 +82,7 @@
   *
   * @since 0.4.2
   */
-  private function checkStyle( $key, $value ) {
+  private function checkSVG( $key, $value ) {
     switch ($key) {
       default: // ***FIX ME*** should be "false"!
 	    return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.