From: Matthew Mondor Date: Mon, 6 Nov 2006 04:03:58 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: pgsql-branch-merge~81 X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=e769b858ff43f094dca57f90620512d94876cdc7;p=mmondor.git *** empty log message *** --- diff --git a/mmsoftware/js/js-sh/app/thumb/thumb.js b/mmsoftware/js/js-sh/app/thumb/thumb.js index 6d1c3a0..a4f561a 100644 --- a/mmsoftware/js/js-sh/app/thumb/thumb.js +++ b/mmsoftware/js/js-sh/app/thumb/thumb.js @@ -1,4 +1,4 @@ -/* $Id: thumb.js,v 1.7 2006/11/05 15:20:59 mmondor Exp $ */ +/* $Id: thumb.js,v 1.8 2006/11/06 04:03:58 mmondor Exp $ */ /* * Copyright (c) 2006, Matthew Mondor @@ -145,79 +145,70 @@ function thumbnail_dir(path, xmax, ymax) for (;;) { try { - dir = new Dir(path); - while ((e = dir.read()) != null) { - if ((e.type & Dir.DT_DIR) != 0 && - e.name.charAt(0) != '.') { - index.push({t: 'DIR', l: e.name}); - if (!thumbnail_dir(path + '/' + - e.name, xmax, ymax)) - break; - } else if ((e.type & Dir.DT_REG) != 0 && - e.name.match( - /\.jpg$|\.jpeg$|\.png$|\.gif$/)) { - if (e.name.match(/_thumb/)) - continue; - i = e.name.lastIndexOf('.'); - newname = e.name.substring(0, i) + - '_thumb' + e.name.substring(i); - if (!thumbnail(path + '/' + e.name, - path + '/' + newname, xmax, ymax)) - break; - index.push({t: 'IMG', o: e.name, - n: newname}); - } + + dir = new Dir(path); + while ((e = dir.read()) != null) { + if ((e.type & Dir.DT_DIR) != 0 && + e.name.charAt(0) != '.') { + index.push({t: 'DIR', l: e.name}); + if (!thumbnail_dir(path + '/' + e.name, xmax, + ymax)) + break; + } else if ((e.type & Dir.DT_REG) != 0 && e.name.match( + /\.jpg$|\.jpeg$|\.png$|\.gif$/)) { + if (e.name.match(/_thumb/)) + continue; + i = e.name.lastIndexOf('.'); + newname = e.name.substring(0, i) + '_thumb' + + e.name.substring(i); + if (!thumbnail(path + '/' + e.name, path + + '/' + newname, xmax, ymax)) + break; + index.push({t: 'IMG', o: e.name, n: newname}); } - if (index.length > 0) { - /* XXX sort */ - fh = new File(path + '/index.html', 'w'); - fh.write("\n" + - '
../ (parent' + - ' directory)

' + "\n"); - for (i in index) { - f = index[i]; - if (f.t == 'DIR') { - var t; - - fh.write('' + - '' + - '

' + - ''); - if ((t = dir_findthumb(path + - '/' + f.l)) != null) - fh.write('

' + - '' + f.l + - '/

' + - "\n"); - } - } - for (i in index) { - f = index[i]; - if (f.t == 'IMG') - fh.write('

' + "\n"); - } - fh.write('
_{' +
- 'Thumb gallery generated by: ' +
- '$Id: thumb.js,v 1.7 2006/11/05 15:20:59 mmondor Exp $' +
- '
(source)' +
- "}\n"); - fh.write("\n"); - fh.close(); + } + if (index.length == 0) { + ret = true; + break; + } + /* XXX sort */ + fh = new File(path + '/index.html', 'w'); + fh.write("\n" + + '
../ (parent directory)' + + "

\n"); + for (i in index) { + f = index[i]; + if (f.t == 'DIR') { + var t; + + fh.write('' + + "

' + + ''); + if ((t = dir_findthumb(path + '/' + f.l)) + != null) + fh.write('

'); + fh.write('

' + f.l + '/

\n"); } + } + for (i in index) { + f = index[i]; + if (f.t == 'IMG') + fh.write('

' + "\n"); + } + fh.write('
_{Thumb gallery generated by: ' +
+ '$Id: thumb.js,v 1.8 2006/11/06 04:03:58 mmondor Exp $' +
+ '
(source)}' + "\n"); + fh.write("\n"); + fh.close(); + } catch (x) { Syslog.log(Syslog.LOG_NOTICE, x.toString()); break; @@ -254,6 +245,7 @@ function dir_findthumb(path) Syslog.log(Syslog.LOG_NOTICE, x.toString()); break; } + break; } try { @@ -263,4 +255,4 @@ function dir_findthumb(path) return ret; } -thumbnail_dir('/home/data/jshttpd/mmondor/testimg', 100, 100); +thumbnail_dir('/home/data/jshttpd/mmondor/img_gallery', 100, 100);