- Corrected attr in place of attrs

[gosa.git] / include / class_ppdManager.inc

diff --git a/include/class_ppdManager.inc b/include/class_ppdManager.inc
index c533fb800586e3ee19838a6ea736253aa9a1c3aa..a9dfd1a7f995e5bb292b7985864ebac8984039c3 100644 (file)
--- a/include/class_ppdManager.inc
+++ b/include/class_ppdManager.inc
@@ -4,6 +4,7 @@ class ppdManager
 {
        var $path= "";
        var $cachedList= array();
+       var $timestamps = array();
 
        function ppdManager($path)
        {
@@ -73,6 +74,12 @@ class ppdManager
                 continue;
             }
 
+                       /* Change model name .. */
+                       if ((preg_match("/^\*".$attribute.":*\s+/",$line)) && ($attribute == "ModelName")){
+                               $line= "*$attribute: \"$value\"\n";
+                               $done =true;
+                       }
+
                        if (($fsection) && ($section != "NO_SECTION")){
                                if (preg_match("/^\*CloseGroup:*\s+\**$section\/*/", $line)){
                                        $fsection= false;
@@ -282,6 +289,16 @@ class ppdManager
                $model= "";
                $manufacturer= "";
 
+               
+               /* Only parse complete PPD file again, if it was changed */
+               $modified = filemtime($ppdFile);
+               if(isset($this->cachedList[$ppdFile]) && isset($this->timestamps[$ppdFile]) && $modified == $this->timestamps[$ppdFile]){
+                       return($this->cachedList[$ppdFile]);
+               }
+
+               /* Remember modified timestamp, to speed up next request */
+               $this->timestamps[$ppdFile] = filemtime($ppdFile);
+
                $fh= fopen ($ppdFile, 'r');
                while ((!feof($fh))&&($fh)) {
 
@@ -323,10 +340,11 @@ class ppdManager
                        $list= $this->findPPD($this->path);
 
                        /* Load descriptive informations to build final printer list */
-                       $this->cachedList= array();
+                       $new = array();
                        foreach ($list as $ppdFile){
-                               $this->cachedList[$ppdFile]= $this->loadDescription($ppdFile);
+                               $new[$ppdFile] = $this->loadDescription($ppdFile); 
                        }
+                       $this->cachedList= $new ;
 
                }