Changeset 6890

Timestamp:

May 1, 2008, 3:11:12 AM (15 years ago)

Author:

ebihara

Message:

OpenPNE_Img::set_source_filename()をOpenPNE_Img_Generator::setCacheFileName()に吸収

Location:

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE

Files:

• Img.php (modified) (3 diffs)
• Img/Generator.php (modified) (1 diff)

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php

@@ -20 +20 @@
      */
     var $requests;
-
-    var $source_filename;
 
     var $generator;
@@ -100 +98 @@
         }
 
-        $this->set_source_filename();
         $this->generator->setOutputFormat($this->requests['f']);
-        $this->generator->setCacheFilename($this->source_filename, $w, $h);
+        $this->generator->setCacheFilename($this->requests['filename'], $w, $h);
 
         if ($this->generator->isCacheReadable()) {
@@ -157 +154 @@
         }
     }
-
-    /**
-     * ソースファイル名(拡張子からフォーマットも)設定
-     * @access protected
-     */
-    function set_source_filename()
-    {
-        if ($this->requests['filename']) {
-            //DBから取得する場合
-            $this->source_filename = $this->requests['filename'];
-        }
-
-        $pieces = explode('.', $this->source_filename);
-        $this->generator->setSourceFormat($this->generator->checkFormatString(array_pop($pieces)));
-    }
 }
 

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img/Generator.php

@@ -206 +206 @@
     }
 
-    function setCacheFileName($source_filename, $w, $h)
-    {
+    function setCacheFileName($filename, $w, $h)
+    {
+        $pieces = explode('.', $filename);
+        $this->setSourceFormat($this->checkFormatString(array_pop($pieces)));
+
         $f = $this->getOutputFormat();
 
         $this->cache_fullpath =
                  $this->cache_dir . '/' .
-                 $this->getCachePath($source_filename, $w, $h, $f);
+                 $this->getCachePath($filename, $w, $h, $f);
     }