Changeset 6137 for trunk

Timestamp:

02/03/12 18:03:45 (4 months ago)

Author:

mtld

Message:

don't track image dependencies without target

Files:

• trunk/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java (modified) (5 diffs)

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java

@@ -74 +74 @@
         }
         
-        String[]        themes    = null;
+        boolean dolog = !targetKey.equals("__NONE__");
+        String[] themes = null;
           
         VirtualTarget target = null;
@@ -120 +121 @@
                 res = ResourceUtil.getResource(uri);
             }
-            DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+            if(dolog) {
+                DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+            }
             return src;
         } else if (isThemedSrc(src, themed_path, themed_img)) {
@@ -151 +154 @@
                 String parent_path = IncludeDocumentExtension.getSystemId(context);
                 Resource relativeParent = parent_path.equals("") ? null : ResourceUtil.getResource(parent_path);
-                DependencyTracker.logTyped("image", res, "", "", relativeParent, parent_part_in, parent_product_in, target);
-                //DependencyTracker.logImage(context, testsrc, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                if(dolog) {
+                    DependencyTracker.logTyped("image", res, "", "", relativeParent, parent_part_in, parent_product_in, target);
+                }
             } else {
             
@@ -169 +173 @@
                 if (res.exists()) {
                     LOG.info("    -> Found src '" + testsrc + "'");
-                    DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    if(dolog) {
+                        DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    }
                     return testsrc;
                 }
@@ -176 +182 @@
                     // "real" missing and "missing, but we found a better version" -- but make sure editor copes with it.
                     //DependencyTracker.logImage(context, testsrc, parent_part_in, parent_product_in, targetGen, targetKey, "shadow");
-                    DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    if(dolog) {
+                        DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    }
                     LOG.info("    -> Image src '" + testsrc + "' not found, trying next theme");
                 } else {
-                    DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    if(dolog) {
+                        DependencyTracker.logImage(context, res, parent_part_in, parent_product_in, targetGen, targetKey, "image");
+                    }
                     LOG.warn("    -> No themed image found!");
                 }