beta 2011.02.08 10:06

1 files changed, 24 insertions, 24 deletions

diff --git a/tex/context/base/data-zip.lua b/tex/context/base/data-zip.lua
index 25d31fb6b..706461aaf 100644
--- a/tex/context/base/data-zip.lua
+++ b/tex/context/base/data-zip.lua
@@ -12,7 +12,7 @@ local format, find, match = string.format, string.find, string.match
 
 local trace_locating = false  trackers.register("resolvers.locating", function(v) trace_locating = v end)
 
-local report_resolvers = logs.new("resolvers")
+local report_zip = logs.new("resolvers","zip")
 
 -- zip:///oeps.zip?name=bla/bla.tex
 -- zip:///oeps.zip?tree=tex/texmf-local
@@ -65,9 +65,9 @@ function resolvers.locators.zip(specification)
     local zipfile = archive and archive ~= "" and zip.openarchive(archive) -- tricky, could be in to be initialized tree
     if trace_locating then
         if zipfile then
-            report_resolvers("zip locator, archive '%s' found",archive)
+            report_zip("locator, archive '%s' found",archive)
         else
-            report_resolvers("zip locator, archive '%s' not found",archive)
+            report_zip("locator, archive '%s' not found",archive)
         end
     end
 end
@@ -75,7 +75,7 @@ end
 function resolvers.hashers.zip(specification)
     local archive = specification.filename
     if trace_locating then
-        report_resolvers("loading zip file '%s'",archive)
+        report_zip("loading file '%s'",archive)
     end
     resolvers.usezipfile(specification.original)
 end
@@ -98,25 +98,25 @@ function resolvers.finders.zip(specification)
             local zfile = zip.openarchive(archive)
             if zfile then
                 if trace_locating then
-                    report_resolvers("zip finder, archive '%s' found",archive)
+                    report_zip("finder, archive '%s' found",archive)
                 end
                 local dfile = zfile:open(queryname)
                 if dfile then
                     dfile = zfile:close()
                     if trace_locating then
-                        report_resolvers("zip finder, file '%s' found",queryname)
+                        report_zip("finder, file '%s' found",queryname)
                     end
                     return specification.original
                 elseif trace_locating then
-                    report_resolvers("zip finder, file '%s' not found",queryname)
+                    report_zip("finder, file '%s' not found",queryname)
                 end
             elseif trace_locating then
-                report_resolvers("zip finder, unknown archive '%s'",archive)
+                report_zip("finder, unknown archive '%s'",archive)
             end
         end
     end
     if trace_locating then
-        report_resolvers("zip finder, '%s' not found",original)
+        report_zip("finder, '%s' not found",original)
     end
     return resolvers.finders.notfound()
 end
@@ -131,24 +131,24 @@ function resolvers.openers.zip(specification)
             local zfile = zip.openarchive(archive)
             if zfile then
                 if trace_locating then
-                    report_resolvers("zip opener, archive '%s' opened",archive)
+                    report_zip("opener, archive '%s' opened",archive)
                 end
                 local dfile = zfile:open(queryname)
                 if dfile then
                     if trace_locating then
-                        report_resolvers("zip opener, file '%s' found",queryname)
+                        report_zip("opener, file '%s' found",queryname)
                     end
                     return resolvers.openers.helpers.textopener('zip',original,dfile)
                 elseif trace_locating then
-                    report_resolvers("zip opener, file '%s' not found",queryname)
+                    report_zip("opener, file '%s' not found",queryname)
                 end
             elseif trace_locating then
-                report_resolvers("zip opener, unknown archive '%s'",archive)
+                report_zip("opener, unknown archive '%s'",archive)
             end
         end
     end
     if trace_locating then
-        report_resolvers("zip opener, '%s' not found",original)
+        report_zip("opener, '%s' not found",original)
     end
     return resolvers.openers.notfound()
 end
@@ -163,27 +163,27 @@ function resolvers.loaders.zip(specification)
             local zfile = zip.openarchive(archive)
             if zfile then
                 if trace_locating then
-                    report_resolvers("zip loader, archive '%s' opened",archive)
+                    report_zip("loader, archive '%s' opened",archive)
                 end
                 local dfile = zfile:open(queryname)
                 if dfile then
                     logs.show_load(original)
                     if trace_locating then
-                        report_resolvers("zip loader, file '%s' loaded",original)
+                        report_zip("loader, file '%s' loaded",original)
                     end
                     local s = dfile:read("*all")
                     dfile:close()
                     return true, s, #s
                 elseif trace_locating then
-                    report_resolvers("zip loader, file '%s' not found",queryname)
+                    report_zip("loader, file '%s' not found",queryname)
                 end
             elseif trace_locating then
-                report_resolvers("zip loader, unknown archive '%s'",archive)
+                report_zip("loader, unknown archive '%s'",archive)
             end
         end
     end
     if trace_locating then
-        report_resolvers("zip loader, '%s' not found",original)
+        report_zip("loader, '%s' not found",original)
     end
     return resolvers.openers.notfound()
 end
@@ -199,7 +199,7 @@ function resolvers.usezipfile(archive)
         if z then
             local tree = url.query(specification.query).tree or ""
             if trace_locating then
-                report_resolvers("zip registering, registering archive '%s'",archive)
+                report_zip("registering, registering archive '%s'",archive)
             end
             statistics.starttiming(resolvers.instance)
             resolvers.prependhash('zip',archive)
@@ -208,10 +208,10 @@ function resolvers.usezipfile(archive)
             instance.files[archive] = resolvers.registerzipfile(z,tree)
             statistics.stoptiming(resolvers.instance)
         elseif trace_locating then
-            report_resolvers("zip registering, unknown archive '%s'",archive)
+            report_zip("registering, unknown archive '%s'",archive)
         end
     elseif trace_locating then
-        report_resolvers("zip registering, '%s' not found",archive)
+        report_zip("registering, '%s' not found",archive)
     end
 end
 
@@ -223,7 +223,7 @@ function resolvers.registerzipfile(z,tree)
         filter = format("^%s/(.+)/(.-)$",tree)
     end
     if trace_locating then
-        report_resolvers("zip registering, using filter '%s'",filter)
+        report_zip("registering, using filter '%s'",filter)
     end
     local register, n = resolvers.registerfile, 0
     for i in z:files() do
@@ -240,6 +240,6 @@ function resolvers.registerzipfile(z,tree)
             n = n + 1
         end
     end
-    report_resolvers("zip registering, %s files registered",n)
+    report_zip("registering, %s files registered",n)
     return files
 end