[pLog-svn] r2440 - in plog/branches/plog-1.0.2/class/gallery: dao data

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-09-02 20:44:35 +0000 (Fri, 02 Sep 2005)
New Revision: 2440

Modified:
   plog/branches/plog-1.0.2/class/gallery/dao/galleryresources.class.php
   plog/branches/plog-1.0.2/class/gallery/data/galleryresourcezipmetadatareader.class.php
Log:
removed GalleryResourceZipMetadataReader::getFiles, since it wasn't used anywhere, and fixed a problem
wtih the metadata in zip files which wasn't being saved at all.


Modified: plog/branches/plog-1.0.2/class/gallery/dao/galleryresources.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/gallery/dao/galleryresources.class.php	2005-09-02 20:03:08 UTC (rev 2439)
+++ plog/branches/plog-1.0.2/class/gallery/dao/galleryresources.class.php	2005-09-02 20:44:35 UTC (rev 2440)
@@ -553,7 +553,14 @@
                 $info["audio"] = $metadata["audio"];
                 $info["playtime_seconds"] = $metadata["playtime_seconds"];                
                 $info["playtime_string"] = $metadata["playtime_string"];                
-             } 
+             }
+             else if( $resourceType == GALLERY_RESOURCE_ZIP ) {
+                $info["zip"]["compressed_size"] = $metadata["zip"]["compressed_size"];
+                $info["zip"]["uncompressed_size"] = $metadata["zip"]["uncompressed_size"];
+                $info["zip"]["entries_count"] = $metadata["zip"]["entries_count"];
+                $info["zip"]["copmression_method"] = $metadata["zip"]["copmression_method"];
+                $info["zip"]["compression_speed"] = $metadata["zip"]["compression_speed"];
+             }
              
              return( $info );            
         }

Modified: plog/branches/plog-1.0.2/class/gallery/data/galleryresourcezipmetadatareader.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/gallery/data/galleryresourcezipmetadatareader.class.php	2005-09-02 20:03:08 UTC (rev 2439)
+++ plog/branches/plog-1.0.2/class/gallery/data/galleryresourcezipmetadatareader.class.php	2005-09-02 20:44:35 UTC (rev 2440)
@@ -14,16 +14,6 @@
         	$this->GalleryResourceBaseMetadataReader( $resource );
         }
 
-        /**
-         * Returns an array with the name of the files insize the zip archive
-         *
-         * @return Array of strings.
-         */
-        function getFiles()
-        {
-        	return $this->_metadata["zip"]["files"];
-        }
-
 		/**
 		 * returns the total compressed size of this file
 		 *