projects / elisp / album.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ae6da9)
(www-image-write-html): Add new argument `prev-file', `next-file' and
authortomo <tomo>
Fri, 15 Apr 2005 13:55:44 +0000 (13:55 +0000)
committertomo <tomo>
Fri, 15 Apr 2005 13:55:44 +0000 (13:55 +0000)
`prev-grade'; add links for `prev-file', `next-file', `prev-grade' and
`next-grade'.
(www-image-convert-images): New optional argument `prev-file' and
`next-file'; modify for `www-image-write-html'.

www-image.el patch | blob | history

diff --git a/www-image.el b/www-image.el
index d6b397b..619b0b4 100644 (file)
--- a/www-image.el
+++ b/www-image.el
@@ -12,7 +12,9 @@
              (/ (* width percent) 100.0)
              (/ (* height percent) 100.0)))))
 
-(defun www-image-write-html (file-base grade next-grade)
+(defun www-image-write-html (file-base grade
+                                      prev-file next-file
+                                      prev-grade next-grade)
   (with-temp-buffer
     (insert
      "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
@@ -24,6 +26,43 @@
     (insert "<body>\n")
     (insert (format "<h1>%s</h1>\n"
                    (file-name-nondirectory file-base)))
+
+    (if prev-file
+       (insert (format "<a href=\"%s.html\">"
+                       (file-name-sans-extension
+                        (file-name-nondirectory prev-file)))))
+    (insert "[Previous]")
+    (if prev-file
+       (insert "</a>"))
+    (insert "\n")
+
+    (if next-file
+       (insert (format "<a href=\"%s.html\">"
+                       (file-name-sans-extension
+                        (file-name-nondirectory next-file)))))
+    (insert "[Next]")
+    (if next-file
+       (insert "</a>"))
+    (insert "\n")
+
+    (if prev-grade
+       (insert (format "<a href=\"../%s/%s.html\">"
+                       prev-grade
+                       (file-name-nondirectory file-base))))
+    (insert "[Smaller]")
+    (if prev-grade
+       (insert "</a>"))
+    (insert "\n")
+
+    (if next-grade
+       (insert (format "<a href=\"../%s/%s.html\">"
+                       next-grade
+                       (file-name-nondirectory file-base))))
+    (insert "[Larger]")
+    (if next-grade
+       (insert "</a>"))
+    (insert "\n")
+
     (insert "
 <hr>
 ")
@@ -58,7 +97,7 @@
                          grade
                          (file-name-nondirectory file-base)))))
 
-(defun www-image-convert-images (filename)
+(defun www-image-convert-images (filename &optional prev-file next-file)
   (let* ((ret
          (with-temp-buffer
            (call-process "identify" nil t t filename)
@@ -68,6 +107,7 @@
                       (string-to-number (match-string 2))))))
         (width (car ret))
         (height (cdr ret))
+        prev-grade
         rest dest)
     (cond ((>= width height)
           (when (setq ret (www-image-make-spec-by-width width 2048 'QXGA))
@@ -106,6 +146,8 @@
       (setq spec (car rest))
       (www-image-write-html (file-name-sans-extension filename)
                            (aref spec 1)
+                           prev-file next-file
+                           prev-grade
                            (if (nth 1 rest)
                                (aref (nth 1 rest) 1)))
       (call-process "convert" nil nil nil
@@ -116,6 +158,7 @@
                            (aref spec 1)
                            (file-name-sans-extension
                             (file-name-nondirectory filename))))
+      (setq prev-grade (aref spec 1))
       (setq rest (cdr rest)))
     (unless (file-exists-p
             (expand-file-name "fullsize"
@@ -131,7 +174,18 @@
                           (file-name-nondirectory filename))))
     dest))
 
-(dolist (file
-        (directory-files
-         "/archives/RAID2/koukotsu/TAKUHON/" t "\\.TIF$"))
-  (www-image-convert-images file))
+(let ((rest
+       (append
+       (directory-files
+        "/archives/RAID2/koukotsu/TAKUHON/" t "^[^0-9].*\\.TIF$")
+       (directory-files
+        "/archives/RAID2/koukotsu/TAKUHON/" t "^[0-9].*\\.TIF$"))
+       ;; (directory-files
+       ;;  "/archives/RAID2/koukotsu/TAKUHON/" t "\\.TIF$")
+       )
+      file prev-file)
+  (while rest
+    (setq file (car rest))
+    (www-image-convert-images file prev-file (nth 1 rest))
+    (setq prev-file file
+         rest (cdr rest))))