richfaces-svn-commits
April 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 645 discussions
JBoss Rich Faces SVN: r13466 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 10:09:02 -0400 (Thu, 09 Apr 2009)
New Revision: 13466
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/
Log:
Removed file/folder
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13465 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 10:08:37 -0400 (Thu, 09 Apr 2009)
New Revision: 13465
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/
Log:
Removed file/folder
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13464 - trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 09:55:07 -0400 (Thu, 09 Apr 2009)
New Revision: 13464
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java
Log:
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java 2009-04-09 13:55:07 UTC (rev 13464)
@@ -0,0 +1,63 @@
+package org.richfaces.realworld.util;
+
+import org.richfaces.realworld.service.Constants;
+
+public enum ImageDimension {
+
+ SIZE_80(80), SIZE_120(120), SIZE_160(160), SIZE_200(200), SIZE_MEDIUM(600), ORIGINAL(0);
+
+ final static String CSS_CLASS = "preview_box_photo_";
+ final static String FILE_POSTFIX = "_small";
+ final static String IMAGE_BG = "/img/shell/frame_photo_%1$d.png";
+ final static String IMAGE_BG_STYLE = "width: %1$dpx; height: %1$dpx";
+
+ int x;
+ String bgStyle;
+ String cssClass;
+ String imageBgSrc;
+ String filePostfix;
+
+ private ImageDimension(int x) {
+ this.x = x;
+ this.bgStyle = String.format(IMAGE_BG_STYLE, x + 20);
+ cssClass = CSS_CLASS + x;
+ imageBgSrc = String.format(IMAGE_BG, (x == 160) ? 200 : x);
+ if(x == 600){
+ filePostfix = "_medium";
+ }else if(x == 0){
+ filePostfix = "";
+ }else{
+ filePostfix = FILE_POSTFIX + x;
+ }
+ }
+
+ public int getX() {
+ return x;
+ }
+
+ public String getCssClass() {
+ return cssClass;
+ }
+
+ public String getImageBg() {
+ return imageBgSrc;
+ }
+
+ public String getImageBgStyle() {
+ return bgStyle;
+ }
+
+ public String getFilePostfix() {
+ return filePostfix;
+ }
+
+ public static ImageDimension getInstance(int x) {
+ ImageDimension [] all = values();
+ for (int i=0; i<all.length; i++) {
+ if (all[i].x == x) {
+ return all[i];
+ }
+ }
+ return values()[Constants.DEFAULT_IMAGE_SIZEVALUE];
+ }
+}
\ No newline at end of file
Property changes on: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13463 - in trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload: Viking and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 09:53:59 -0400 (Thu, 09 Apr 2009)
New Revision: 13463
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/
Log:
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13462 - in trunk/test-applications/realworld2/ejb/src/main: java/org/richfaces/realworld/service and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 09:52:23 -0400 (Thu, 09 Apr 2009)
New Revision: 13462
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
Log:
Refactoring FileManager
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -20,6 +20,7 @@
*/
package org.richfaces.realworld.domain;
+import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -342,6 +343,13 @@
image.setVisited(isSetVisited);
}
+ public String getPath(){
+ if(getShelf() != null && getOwner() != null && getShelf().getPath() != null){
+ return getShelf().getPath() + this.getId().toString() + File.separator;
+ }
+ return null;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -25,6 +25,7 @@
*/
package org.richfaces.realworld.domain;
+import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -555,6 +556,13 @@
return s.toString();
}
+ public String getFullPath(){
+ if(getAlbum() != null && getAlbum().getOwner() != null && getAlbum().getPath() != null){
+ return getAlbum().getPath() + this.path;
+ }
+ return null;
+ }
+
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -1,5 +1,6 @@
package org.richfaces.realworld.domain;
+import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -298,6 +299,13 @@
}
return null;
}
+
+ public String getPath(){
+ if(getOwner() != null && getOwner().getPath() != null){
+ return getOwner().getPath() + this.getId().toString() + File.separator;
+ }
+ return null;
+ }
public boolean equals(Object o) {
if (this == o) return true;
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -20,6 +20,7 @@
*/
package org.richfaces.realworld.domain;
+import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -354,4 +355,11 @@
}
return images;
}
+
+ public String getPath(){
+ if(this.getId() != null){
+ return File.separator + this.getLogin().toString() + File.separator;
+ }
+ return null;
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -52,9 +52,19 @@
public static final String USER_DELETED_EVENT = "userDeletedEvent";
//Errors(Internationalization pending)
+ public static final String UPDATE_USER_ERROR = "Error while saving preferences to database.";
+ public static final String SHELF_DELETING_ERROR = "Error while deleting shelf from database.";
+ public static final String SHELF_SAVING_ERROR = "Error while saving shelf to database.";
+ public static final String DELETE_COMMENT_ERROR = "Error while deleting comment from database.";
+ public static final String SAVE_COMMENT_ERROR = "Error while saving comment to database.";
+ public static final String IMAGE_SAVING_ERROR = "Error while saving image to database.";
+ public static final String IMAGE_DELETING_ERROR = "Error while deleting image from database.";
+ public static final String ERROR_IN_DB = "Error in DB.";
+ public static final String ALBUM_DELETING_ERROR = "Error while deleting album from database.";
+ public static final String ALBUM_SAVING_ERROR = "Error while saving album to database";
public static final String SHELF_MUST_BE_NOT_NULL_ERROR = "Shelf must be not-null";
public static final String NO_SHELF_ERROR = "You must create at least one shelf before creating album!";
- public static final String ALBUM_CREATE_ERROR = "You must create at least one shelf before creating album!";
+ public static final String FILE_UPLOAD_SHOW_ERROR = "You must create at least one shelf before uploading images!";
public static final String DND_ALBUM_ERROR = "You can't add album to that shelf";
public static final String DND_PHOTO_ERROR = "You can't add photo's to that album";
public static final String NO_ALBUM_TO_DOWNLOAD_ERROR = "Please specify album to download";
@@ -91,21 +101,10 @@
public static final String ADMIN_ROLE = "admin";
public static final String GUEST_ROLE = "guest";
- //Size
- public static final int MEDIUM_SIZE = 600;
- public static final int SMALL_200_SIZE = 200;
- public static final int SMALL_160_SIZE = 160;
- public static final int SMALL_120_SIZE = 120;
- public static final int SMALL_80_SIZE = 80;
- public static final int AVATAR_SIZE = 80;
- public static final String AVATAR_JPG = "/avatar.jpg";
- public static final String _SMALL160 = "_small160";
- public static final String _SMALL120 = "_small120";
- public static final String _SMALL80 = "_small80";
- public static final String _SMALL200 = "_small200";
- public static final String _MEDIUM = "_medium";
-
//misc
+ public static final String AVATAR_JPG = "avatar.jpg";
+ public static final int AVATAR_SIZE = 80;
+ public static final int DEFAULT_IMAGE_SIZEVALUE = 120;
public static final String SLASH = "/";
public static final String DOT = ".";
public static final String JPEG = "jpeg";
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-04-09 13:52:23 UTC (rev 13462)
@@ -51,8 +51,7 @@
@In(value="entityManager")
EntityManager em;
- @In
- private User user;
+ @In private User user;
/**
* Return List of albums, founded by query
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-04-09 13:52:12 UTC (rev 13461)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-04-09 13:52:23 UTC (rev 13462)
@@ -13,67 +13,67 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (0, 'Animals', 'Animals pictures', 1, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (0, 'Animals');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (0, '067.jpg', 'amarkhel/0/067.jpg', 'Animals - 067.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (0, '067.jpg', '067.jpg', 'Animals - 067.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 0);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (1, '10005.jpg', 'amarkhel/0/10005.jpg', 'Animals - 10005.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (1, '10005.jpg', '10005.jpg', 'Animals - 10005.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', 'I Think this is Art!',1, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'nice shot =) ',1, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'nice shot =) ',1, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (2, '400004.jpg', 'amarkhel/0/400004.jpg', 'Animals - 400004.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (2, '400004.jpg', '400004.jpg', 'Animals - 400004.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (3, '400008.jpg', 'amarkhel/0/400008.jpg', 'Animals - 400008.jpg image', '2009-12-18', 0, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (3, '400008.jpg', '400008.jpg', 'Animals - 400008.jpg image', '2009-12-18', 0, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (3, '1985-01-08', 'love every thing about this picture, really beautiful... :))',3, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'Amazing shot..',3, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (5, '1985-01-08', 'love every thing about this picture, really beautiful... :))',3, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (4, '400027.jpg', 'amarkhel/0/400027.jpg', 'Animals - 400027.jpg image', '2009-12-18', 0, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (4, '400027.jpg', '400027.jpg', 'Animals - 400027.jpg image', '2009-12-18', 0, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 4);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (6, '1985-01-08', 'Such a lovely colour azaga!',4, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (7, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',4, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (8, '1985-01-08', 'Bellissima macro!',4, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (9, '1985-01-08', 'this is extremely Good:) Congratulations!',4, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (5, '400028.jpg', 'amarkhel/0/400028.jpg', 'Animals - 400028.jpg image', '2009-12-18', 0, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (5, '400028.jpg', '400028.jpg', 'Animals - 400028.jpg image', '2009-12-18', 0, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 5);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (10, '1985-01-08', 'Stunning capture! :-)',5, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (11, '1985-01-08', '++Beautiful',5, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (6, '400034.jpg', 'amarkhel/0/400034.jpg', 'Animals - 400034.jpg image', '2009-12-18', 0, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (6, '400034.jpg', '400034.jpg', 'Animals - 400034.jpg image', '2009-12-18', 0, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 6);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (12, '1985-01-08', 'Very *lovely*',6, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (7, '400035.jpg', 'amarkhel/0/400035.jpg', 'Animals - 400035.jpg image', '2009-12-18', 0, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (7, '400035.jpg', '400035.jpg', 'Animals - 400035.jpg image', '2009-12-18', 0, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 7);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (13, '1985-01-08', 'whoah ! wonderful',7, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (14, '1985-01-08', 'I Think this is Art!',7, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (15, '1985-01-08', 'I Think this is Art!',7, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (16, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',7, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (8, '400063.jpg', 'amarkhel/0/400063.jpg', 'Animals - 400063.jpg image', '2009-12-18', 0, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (8, '400063.jpg', '400063.jpg', 'Animals - 400063.jpg image', '2009-12-18', 0, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 8);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (17, '1985-01-08', 'whoah ! wonderful',8, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (18, '1985-01-08', 'love every thing about this picture, really beautiful... :))',8, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (9, '400095.jpg', 'amarkhel/0/400095.jpg', 'Animals - 400095.jpg image', '2009-12-18', 0, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (9, '400095.jpg', '400095.jpg', 'Animals - 400095.jpg image', '2009-12-18', 0, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 9);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (19, '1985-01-08', 'Gorgeous! Lovely color!',9, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (20, '1985-01-08', 'whoah ! wonderful',9, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (21, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',9, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (22, '1985-01-08', 'Stunning capture! :-)',9, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (10, 'deer.jpg', 'amarkhel/0/deer.jpg', 'Animals - deer.jpg image', '2009-12-18', 0, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (10, 'deer.jpg', 'deer.jpg', 'Animals - deer.jpg image', '2009-12-18', 0, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 10);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (23, '1985-01-08', 'Bellísima.!!! saludos.',10, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (24, '1985-01-08', '++Beautiful',10, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (11, 'dog2.jpg', 'amarkhel/0/dog2.jpg', 'Animals - dog2.jpg image', '2009-12-18', 0, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (11, 'dog2.jpg', 'dog2.jpg', 'Animals - dog2.jpg image', '2009-12-18', 0, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 11);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (25, '1985-01-08', '++Beautiful',11, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (26, '1985-01-08', 'love every thing about this picture, really beautiful... :))',11, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (12, 'pinn40.jpg', 'amarkhel/0/pinn40.jpg', 'Animals - pinn40.jpg image', '2009-12-18', 0, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (12, 'pinn40.jpg', 'pinn40.jpg', 'Animals - pinn40.jpg image', '2009-12-18', 0, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 12);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (13, 'pinn51.jpg', 'amarkhel/0/pinn51.jpg', 'Animals - pinn51.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (13, 'pinn51.jpg', 'pinn51.jpg', 'Animals - pinn51.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 13);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (27, '1985-01-08', 'nice shot =) ',13, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (28, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',13, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (29, '1985-01-08', 'whoah ! wonderful',13, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (30, '1985-01-08', 'fantastic shot !!!!!!',13, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, 'turtle.jpg', 'amarkhel/0/turtle.jpg', 'Animals - turtle.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, 'turtle.jpg', 'turtle.jpg', 'Animals - turtle.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 15);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (33, '1985-01-08', 'I Think this is Art!',15, 1);
@@ -83,78 +83,78 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (1, 'Building', 'Building pictures', 3, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (1, 'Building');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (16, '1.jpg', 'Viking/1/1.jpg', 'Building - 1.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (16, '1.jpg', '1.jpg', 'Building - 1.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 16);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (34, '1985-01-08', 'whoah ! wonderful',16, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (35, '1985-01-08', 'Bellísima.!!! saludos.',16, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (36, '1985-01-08', 'Amazing shot..',16, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (37, '1985-01-08', 'Bellísima.!!! saludos.',16, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (17, '2.jpg', 'Viking/1/2.jpg', 'Building - 2.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (17, '2.jpg', '2.jpg', 'Building - 2.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 17);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (38, '1985-01-08', 'Bellísima.!!! saludos.',17, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (39, '1985-01-08', 'that is a beautiful flower with great colours ',17, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (40, '1985-01-08', 'Very *lovely*',17, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (41, '1985-01-08', 'Stunning capture! :-)',17, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (18, '3.jpg', 'Viking/1/3.jpg', 'Building - 3.jpg image', '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (18, '3.jpg', '3.jpg', 'Building - 3.jpg image', '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 18);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (42, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',18, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (43, '1985-01-08', 'whoah ! wonderful',18, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (19, '4.jpg', 'Viking/1/4.jpg', 'Building - 4.jpg image', '2009-12-18', 1, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (19, '4.jpg', '4.jpg', 'Building - 4.jpg image', '2009-12-18', 1, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 19);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (44, '1985-01-08', 'Amazing shot..',19, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (45, '1985-01-08', 'that is a beautiful flower with great colours ',19, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (20, '400018.jpg', 'Viking/1/400018.jpg', 'Building - 400018.jpg image', '2009-12-18', 1, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (20, '400018.jpg', '400018.jpg', 'Building - 400018.jpg image', '2009-12-18', 1, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 20);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (46, '1985-01-08', 'Very *lovely*',20, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (47, '1985-01-08', 'Very *lovely*',20, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (48, '1985-01-08', 'nice shot =) ',20, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (49, '1985-01-08', 'Stunning capture! :-)',20, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (21, '400036.jpg', 'Viking/1/400036.jpg', 'Building - 400036.jpg image', '2009-12-18', 1, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (21, '400036.jpg', '400036.jpg', 'Building - 400036.jpg image', '2009-12-18', 1, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 21);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (50, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',21, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (51, '1985-01-08', 'Stunning capture! :-)',21, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (22, '400069.jpg', 'Viking/1/400069.jpg', 'Building - 400069.jpg image', '2009-12-18', 1, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (22, '400069.jpg', '400069.jpg', 'Building - 400069.jpg image', '2009-12-18', 1, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 22);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (52, '1985-01-08', 'Bellissima macro!',22, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (53, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',22, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (54, '1985-01-08', 'this is extremely Good:) Congratulations!',22, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (55, '1985-01-08', 'I Think this is Art!',22, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (23, '400076.jpg', 'Viking/1/400076.jpg', 'Building - 400076.jpg image', '2009-12-18', 1, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (23, '400076.jpg', '400076.jpg', 'Building - 400076.jpg image', '2009-12-18', 1, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 23);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (56, '1985-01-08', 'Stunning capture! :-)',23, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (57, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',23, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (58, '1985-01-08', 'this is extremely Good:) Congratulations!',23, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (59, '1985-01-08', 'Wonderful.',23, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (24, '400083.jpg', 'Viking/1/400083.jpg', 'Building - 400083.jpg image', '2009-12-18', 1, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (24, '400083.jpg', '400083.jpg', 'Building - 400083.jpg image', '2009-12-18', 1, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 24);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (60, '1985-01-08', 'fantastic shot !!!!!!',24, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (61, '1985-01-08', 'Wonderful.',24, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (25, '5.jpg', 'Viking/1/5.jpg', 'Building - 5.jpg image', '2009-12-18', 1, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (25, '5.jpg', '5.jpg', 'Building - 5.jpg image', '2009-12-18', 1, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 25);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (62, '1985-01-08', 'Amazing shot..',25, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (63, '1985-01-08', '++Beautiful',25, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (64, '1985-01-08', 'fantastic shot !!!!!!',25, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (26, '6.jpg', 'Viking/1/6.jpg', 'Building - 6.jpg image', '2009-12-18', 1, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (26, '6.jpg', '6.jpg', 'Building - 6.jpg image', '2009-12-18', 1, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 26);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (65, '1985-01-08', 'this is extremely Good:) Congratulations!',26, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (27, '7.jpg', 'Viking/1/7.jpg', 'Building - 7.jpg image', '2009-12-18', 1, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (27, '7.jpg', '7.jpg', 'Building - 7.jpg image', '2009-12-18', 1, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 27);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (66, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',27, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (67, '1985-01-08', 'Bellísima.!!! saludos.',27, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (68, '1985-01-08', 'love every thing about this picture, really beautiful... :))',27, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (69, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',27, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (28, 'church.jpg', 'Viking/1/church.jpg', 'Building - church.jpg image', '2009-12-18', 1, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (28, 'church.jpg', 'church.jpg', 'Building - church.jpg image', '2009-12-18', 1, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 28);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (70, '1985-01-08', 'Beautiful colours. Nice close up. ',28, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (71, '1985-01-08', 'Bellissima macro!',28, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (72, '1985-01-08', 'Bellísima.!!! saludos.',28, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (29, 'pinn71.jpg', 'Viking/1/pinn71.jpg', 'Building - pinn71.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (29, 'pinn71.jpg', 'pinn71.jpg', 'Building - pinn71.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 29);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, 'pinn82.jpg', 'Viking/1/pinn82.jpg', 'Building - pinn82.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, 'pinn82.jpg', 'pinn82.jpg', 'Building - pinn82.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 30);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (73, '1985-01-08', '++Beautiful',30, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (74, '1985-01-08', 'Bellissima macro!',30, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (31, 'thumbs.db', 'Viking/1/thumbs.db', 'Building - thumbs.db image', '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (31, 'thumbs.db', 'thumbs.db', 'Building - thumbs.db image', '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 31);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (75, '1985-01-08', 'Stunning capture! :-)',31, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (76, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',31, 2);
@@ -166,66 +166,66 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (2, 'Coasts', 'Coasts pictures', 4, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (2, 'Coasts');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (32, '203015.jpg', 'Noname/2/203015.jpg', 'Coasts - 203015.jpg image', '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (32, '203015.jpg', '203015.jpg', 'Coasts - 203015.jpg image', '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 32);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (78, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',32, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (79, '1985-01-08', 'Bellísima.!!! saludos.',32, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (80, '1985-01-08', 'nice shot =) ',32, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (33, '203034.jpg', 'Noname/2/203034.jpg', 'Coasts - 203034.jpg image', '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (33, '203034.jpg', '203034.jpg', 'Coasts - 203034.jpg image', '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 33);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (81, '1985-01-08', 'nice shot =) ',33, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (82, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',33, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (34, '203036.jpg', 'Noname/2/203036.jpg', 'Coasts - 203036.jpg image', '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (34, '203036.jpg', '203036.jpg', 'Coasts - 203036.jpg image', '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 34);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (83, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',34, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (84, '1985-01-08', 'nice shot =) ',34, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (85, '1985-01-08', 'Perfecft!',34, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (35, '203043.jpg', 'Noname/2/203043.jpg', 'Coasts - 203043.jpg image', '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (35, '203043.jpg', '203043.jpg', 'Coasts - 203043.jpg image', '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 35);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (86, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',35, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (87, '1985-01-08', 'Stunning capture! :-)',35, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (88, '1985-01-08', 'Bellissima macro!',35, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (89, '1985-01-08', 'I Think this is Art!',35, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (36, '203049.jpg', 'Noname/2/203049.jpg', 'Coasts - 203049.jpg image', '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (36, '203049.jpg', '203049.jpg', 'Coasts - 203049.jpg image', '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 36);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (90, '1985-01-08', 'Bellissima macro!',36, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (91, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',36, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (92, '1985-01-08', 'Beautiful colours. Nice close up. ',36, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (93, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',36, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (37, '203052.jpg', 'Noname/2/203052.jpg', 'Coasts - 203052.jpg image', '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (37, '203052.jpg', '203052.jpg', 'Coasts - 203052.jpg image', '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 37);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (94, '1985-01-08', 'Gorgeous! Lovely color!',37, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (38, '203053.jpg', 'Noname/2/203053.jpg', 'Coasts - 203053.jpg image', '2009-12-18', 2, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (38, '203053.jpg', '203053.jpg', 'Coasts - 203053.jpg image', '2009-12-18', 2, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 38);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (95, '1985-01-08', 'Bellissima macro!',38, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (96, '1985-01-08', 'whoah ! wonderful',38, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (97, '1985-01-08', 'this is extremely Good:) Congratulations!',38, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (39, '203054.jpg', 'Noname/2/203054.jpg', 'Coasts - 203054.jpg image', '2009-12-18', 2, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (39, '203054.jpg', '203054.jpg', 'Coasts - 203054.jpg image', '2009-12-18', 2, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 39);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (98, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',39, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (99, '1985-01-08', 'fantastic shot !!!!!!',39, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (40, '203058.jpg', 'Noname/2/203058.jpg', 'Coasts - 203058.jpg image', '2009-12-18', 2, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (40, '203058.jpg', '203058.jpg', 'Coasts - 203058.jpg image', '2009-12-18', 2, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 40);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (100, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',40, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (41, '203066.jpg', 'Noname/2/203066.jpg', 'Coasts - 203066.jpg image', '2009-12-18', 2, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (41, '203066.jpg', '203066.jpg', 'Coasts - 203066.jpg image', '2009-12-18', 2, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 41);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (42, '203067.jpg', 'Noname/2/203067.jpg', 'Coasts - 203067.jpg image', '2009-12-18', 2, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (42, '203067.jpg', '203067.jpg', 'Coasts - 203067.jpg image', '2009-12-18', 2, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 42);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (101, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',42, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (43, '203071.jpg', 'Noname/2/203071.jpg', 'Coasts - 203071.jpg image', '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (43, '203071.jpg', '203071.jpg', 'Coasts - 203071.jpg image', '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 43);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (102, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',43, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (44, '203072.jpg', 'Noname/2/203072.jpg', 'Coasts - 203072.jpg image', '2009-12-18', 2, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (44, '203072.jpg', '203072.jpg', 'Coasts - 203072.jpg image', '2009-12-18', 2, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 44);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (103, '1985-01-08', 'Bellissima macro!',44, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (104, '1985-01-08', 'I Think this is Art!',44, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (105, '1985-01-08', 'Such a lovely colour azaga!',44, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, '203073.jpg', 'Noname/2/203073.jpg', 'Coasts - 203073.jpg image', '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, '203073.jpg', '203073.jpg', 'Coasts - 203073.jpg image', '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 45);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (106, '1985-01-08', 'this is extremely Good:) Congratulations!',45, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (107, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',45, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (108, '1985-01-08', 'Bellísima.!!! saludos.',45, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (46, '203076.jpg', 'Noname/2/203076.jpg', 'Coasts - 203076.jpg image', '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (46, '203076.jpg', '203076.jpg', 'Coasts - 203076.jpg image', '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 46);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (109, '1985-01-08', 'that is a beautiful flower with great colours ',46, 3);
@@ -235,60 +235,60 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (3, 'Flora', 'Flora pictures', 2, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (3, 'Flora');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (48, '132000.jpg', 'amarkhel/3/132000.jpg', 'Flora - 132000.jpg image', '2009-12-18', 3, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (48, '132000.jpg', '132000.jpg', 'Flora - 132000.jpg image', '2009-12-18', 3, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 48);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (112, '1985-01-08', 'this is extremely Good:) Congratulations!',48, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (49, '132022.jpg', 'amarkhel/3/132022.jpg', 'Flora - 132022.jpg image', '2009-12-18', 3, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (49, '132022.jpg', '132022.jpg', 'Flora - 132022.jpg image', '2009-12-18', 3, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 49);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (113, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',49, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (114, '1985-01-08', 'Wonderful.',49, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (115, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',49, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (50, '132051.jpg', 'amarkhel/3/132051.jpg', 'Flora - 132051.jpg image', '2009-12-18', 3, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (50, '132051.jpg', '132051.jpg', 'Flora - 132051.jpg image', '2009-12-18', 3, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 50);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (116, '1985-01-08', 'Wonderful.',50, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (117, '1985-01-08', 'Very *lovely*',50, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (118, '1985-01-08', 'fantastic shot !!!!!!',50, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (119, '1985-01-08', 'Such a lovely colour azaga!',50, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (51, '132059.jpg', 'amarkhel/3/132059.jpg', 'Flora - 132059.jpg image', '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (51, '132059.jpg', '132059.jpg', 'Flora - 132059.jpg image', '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 51);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (120, '1985-01-08', 'Amazing shot..',51, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (121, '1985-01-08', 'Beautiful colours. Nice close up. ',51, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (52, '132060.jpg', 'amarkhel/3/132060.jpg', 'Flora - 132060.jpg image', '2009-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (52, '132060.jpg', '132060.jpg', 'Flora - 132060.jpg image', '2009-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 52);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (122, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',52, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (53, '132071.jpg', 'amarkhel/3/132071.jpg', 'Flora - 132071.jpg image', '2009-12-18', 3, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (53, '132071.jpg', '132071.jpg', 'Flora - 132071.jpg image', '2009-12-18', 3, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 53);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (123, '1985-01-08', 'love every thing about this picture, really beautiful... :))',53, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (124, '1985-01-08', 'that is a beautiful flower with great colours ',53, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (125, '1985-01-08', 'that is a beautiful flower with great colours ',53, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (54, '132074.jpg', 'amarkhel/3/132074.jpg', 'Flora - 132074.jpg image', '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (54, '132074.jpg', '132074.jpg', 'Flora - 132074.jpg image', '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 54);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (126, '1985-01-08', 'that is a beautiful flower with great colours ',54, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (55, '132078.jpg', 'amarkhel/3/132078.jpg', 'Flora - 132078.jpg image', '2009-12-18', 3, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (55, '132078.jpg', '132078.jpg', 'Flora - 132078.jpg image', '2009-12-18', 3, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 55);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (56, '142011.jpg', 'amarkhel/3/142011.jpg', 'Flora - 142011.jpg image', '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (56, '142011.jpg', '142011.jpg', 'Flora - 142011.jpg image', '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 56);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (57, '142039.jpg', 'amarkhel/3/142039.jpg', 'Flora - 142039.jpg image', '2009-12-18', 3, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (57, '142039.jpg', '142039.jpg', 'Flora - 142039.jpg image', '2009-12-18', 3, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 57);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (127, '1985-01-08', 'Stunning capture! :-)',57, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (128, '1985-01-08', 'this is extremely Good:) Congratulations!',57, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (129, '1985-01-08', 'Very *lovely*',57, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (130, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',57, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (58, '167049.jpg', 'amarkhel/3/167049.jpg', 'Flora - 167049.jpg image', '2009-12-18', 3, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (58, '167049.jpg', '167049.jpg', 'Flora - 167049.jpg image', '2009-12-18', 3, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 58);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (59, '167055.jpg', 'amarkhel/3/167055.jpg', 'Flora - 167055.jpg image', '2009-12-18', 3, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (59, '167055.jpg', '167055.jpg', 'Flora - 167055.jpg image', '2009-12-18', 3, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 59);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (131, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',59, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, '400010.jpg', 'amarkhel/3/400010.jpg', 'Flora - 400010.jpg image', '2009-12-18', 3, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, '400010.jpg', '400010.jpg', 'Flora - 400010.jpg image', '2009-12-18', 3, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 60);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (132, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',60, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (133, '1985-01-08', 'Perfecft!',60, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (61, '400073.jpg', 'amarkhel/3/400073.jpg', 'Flora - 400073.jpg image', '2009-12-18', 3, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (61, '400073.jpg', '400073.jpg', 'Flora - 400073.jpg image', '2009-12-18', 3, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 61);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (134, '1985-01-08', 'Amazing shot..',61, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (135, '1985-01-08', 'Gorgeous! Lovely color!',61, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (136, '1985-01-08', '++Beautiful',61, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (62, '403011.jpg', 'amarkhel/3/403011.jpg', 'Flora - 403011.jpg image', '2009-12-18', 3, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (62, '403011.jpg', '403011.jpg', 'Flora - 403011.jpg image', '2009-12-18', 3, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 62);
---------------------------------------------------------------------
@@ -297,92 +297,92 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (4, 'Ices', 'Ices pictures', 3, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (4, 'Ices');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (64, '184023.jpg', 'Viking/4/184023.jpg', 'Ices - 184023.jpg image', '2009-12-18', 4, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (64, '184023.jpg', '184023.jpg', 'Ices - 184023.jpg image', '2009-12-18', 4, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 64);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (140, '1985-01-08', 'fantastic shot !!!!!!',64, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (141, '1985-01-08', 'Stunning capture! :-)',64, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (65, '184030.jpg', 'Viking/4/184030.jpg', 'Ices - 184030.jpg image', '2009-12-18', 4, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (65, '184030.jpg', '184030.jpg', 'Ices - 184030.jpg image', '2009-12-18', 4, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 65);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (142, '1985-01-08', 'I Think this is Art!',65, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (143, '1985-01-08', 'whoah ! wonderful',65, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (144, '1985-01-08', 'nice shot =) ',65, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (66, '184031.jpg', 'Viking/4/184031.jpg', 'Ices - 184031.jpg image', '2009-12-18', 4, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (66, '184031.jpg', '184031.jpg', 'Ices - 184031.jpg image', '2009-12-18', 4, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 66);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (145, '1985-01-08', 'nice shot =) ',66, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (146, '1985-01-08', 'Gorgeous! Lovely color!',66, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (147, '1985-01-08', 'I Think this is Art!',66, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (67, '184033.jpg', 'Viking/4/184033.jpg', 'Ices - 184033.jpg image', '2009-12-18', 4, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (67, '184033.jpg', '184033.jpg', 'Ices - 184033.jpg image', '2009-12-18', 4, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 67);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (148, '1985-01-08', 'Very *lovely*',67, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (149, '1985-01-08', 'Bellísima.!!! saludos.',67, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (150, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',67, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (151, '1985-01-08', 'nice shot =) ',67, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (68, '184034.jpg', 'Viking/4/184034.jpg', 'Ices - 184034.jpg image', '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (68, '184034.jpg', '184034.jpg', 'Ices - 184034.jpg image', '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 68);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (69, '184035.jpg', 'Viking/4/184035.jpg', 'Ices - 184035.jpg image', '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (69, '184035.jpg', '184035.jpg', 'Ices - 184035.jpg image', '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 69);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (152, '1985-01-08', 'that is a beautiful flower with great colours ',69, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (153, '1985-01-08', 'Perfecft!',69, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (154, '1985-01-08', 'Bellissima macro!',69, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (155, '1985-01-08', 'Amazing shot..',69, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (70, '184038.jpg', 'Viking/4/184038.jpg', 'Ices - 184038.jpg image', '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (70, '184038.jpg', '184038.jpg', 'Ices - 184038.jpg image', '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 70);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (156, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',70, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (157, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',70, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (158, '1985-01-08', 'Gorgeous! Lovely color!',70, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (159, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',70, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (71, '184040.jpg', 'Viking/4/184040.jpg', 'Ices - 184040.jpg image', '2009-12-18', 4, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (71, '184040.jpg', '184040.jpg', 'Ices - 184040.jpg image', '2009-12-18', 4, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 71);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (160, '1985-01-08', 'Wonderful.',71, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (161, '1985-01-08', 'Very *lovely*',71, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (162, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',71, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (72, '184044.jpg', 'Viking/4/184044.jpg', 'Ices - 184044.jpg image', '2009-12-18', 4, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (72, '184044.jpg', '184044.jpg', 'Ices - 184044.jpg image', '2009-12-18', 4, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 72);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (73, '184046.jpg', 'Viking/4/184046.jpg', 'Ices - 184046.jpg image', '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (73, '184046.jpg', '184046.jpg', 'Ices - 184046.jpg image', '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 73);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (163, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',73, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (164, '1985-01-08', 'Perfecft!',73, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (74, '184047.jpg', 'Viking/4/184047.jpg', 'Ices - 184047.jpg image', '2009-12-18', 4, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (74, '184047.jpg', '184047.jpg', 'Ices - 184047.jpg image', '2009-12-18', 4, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 74);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (165, '1985-01-08', 'Very *lovely*',74, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (75, '184053.jpg', 'Viking/4/184053.jpg', 'Ices - 184053.jpg image', '2009-12-18', 4, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (75, '184053.jpg', '184053.jpg', 'Ices - 184053.jpg image', '2009-12-18', 4, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 75);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (166, '1985-01-08', 'Perfecft!',75, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (167, '1985-01-08', 'love every thing about this picture, really beautiful... :))',75, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (168, '1985-01-08', '++Beautiful',75, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (169, '1985-01-08', 'fantastic shot !!!!!!',75, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (76, '184057.jpg', 'Viking/4/184057.jpg', 'Ices - 184057.jpg image', '2009-12-18', 4, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (76, '184057.jpg', '184057.jpg', 'Ices - 184057.jpg image', '2009-12-18', 4, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 76);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (170, '1985-01-08', 'this is extremely Good:) Congratulations!',76, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (77, '184063.jpg', 'Viking/4/184063.jpg', 'Ices - 184063.jpg image', '2009-12-18', 4, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (77, '184063.jpg', '184063.jpg', 'Ices - 184063.jpg image', '2009-12-18', 4, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 77);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (171, '1985-01-08', 'nice shot =) ',77, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (172, '1985-01-08', 'Stunning capture! :-)',77, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (173, '1985-01-08', 'whoah ! wonderful',77, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (78, '184069.jpg', 'Viking/4/184069.jpg', 'Ices - 184069.jpg image', '2009-12-18', 4, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (78, '184069.jpg', '184069.jpg', 'Ices - 184069.jpg image', '2009-12-18', 4, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 78);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (174, '1985-01-08', 'Such a lovely colour azaga!',78, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (175, '1985-01-08', 'love every thing about this picture, really beautiful... :))',78, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (176, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',78, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (79, '184072.jpg', 'Viking/4/184072.jpg', 'Ices - 184072.jpg image', '2009-12-18', 4, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (79, '184072.jpg', '184072.jpg', 'Ices - 184072.jpg image', '2009-12-18', 4, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 79);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (177, '1985-01-08', 'Beautiful colours. Nice close up. ',79, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (178, '1985-01-08', 'love every thing about this picture, really beautiful... :))',79, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (179, '1985-01-08', '++Beautiful',79, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (180, '1985-01-08', 'Bellísima.!!! saludos.',79, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, '184077.jpg', 'Viking/4/184077.jpg', 'Ices - 184077.jpg image', '2009-12-18', 4, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, '184077.jpg', '184077.jpg', 'Ices - 184077.jpg image', '2009-12-18', 4, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 80);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (181, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',80, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (182, '1985-01-08', 'Stunning capture! :-)',80, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (81, '184078.jpg', 'Viking/4/184078.jpg', 'Ices - 184078.jpg image', '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (81, '184078.jpg', '184078.jpg', 'Ices - 184078.jpg image', '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 81);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (183, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',81, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (184, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',81, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (82, '184079.jpg', 'Viking/4/184079.jpg', 'Ices - 184079.jpg image', '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (82, '184079.jpg', '184079.jpg', 'Ices - 184079.jpg image', '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 82);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (185, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',82, 2);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (186, '1985-01-08', 'Gorgeous! Lovely color!',82, 2);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (83, '400000.jpg', 'Viking/4/400000.jpg', 'Ices - 400000.jpg image', '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (83, '400000.jpg', '400000.jpg', 'Ices - 400000.jpg image', '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 83);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (187, '1985-01-08', 'nice shot =) ',83, 2);
@@ -393,69 +393,69 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (5, 'Sport', 'Sport pictures', 4, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (5, 'Sport');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (85, '23048.jpg', 'Noname/5/23048.jpg', 'Sport - 23048.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (85, '23048.jpg', '23048.jpg', 'Sport - 23048.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 85);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (191, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',85, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (86, '400003.jpg', 'Noname/5/400003.jpg', 'Sport - 400003.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (86, '400003.jpg', '400003.jpg', 'Sport - 400003.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 86);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (192, '1985-01-08', 'Amazing shot..',86, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (87, '400033.jpg', 'Noname/5/400033.jpg', 'Sport - 400033.jpg image', '2009-12-18', 5, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (87, '400033.jpg', '400033.jpg', 'Sport - 400033.jpg image', '2009-12-18', 5, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 87);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (88, '400048.jpg', 'Noname/5/400048.jpg', 'Sport - 400048.jpg image', '2009-12-18', 5, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (88, '400048.jpg', '400048.jpg', 'Sport - 400048.jpg image', '2009-12-18', 5, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 88);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (193, '1985-01-08', 'Wonderful.',88, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (89, '400081.jpg', 'Noname/5/400081.jpg', 'Sport - 400081.jpg image', '2009-12-18', 5, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (89, '400081.jpg', '400081.jpg', 'Sport - 400081.jpg image', '2009-12-18', 5, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 89);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (194, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',89, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (195, '1985-01-08', 'Beautiful colours. Nice close up. ',89, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (196, '1985-01-08', 'this is extremely Good:) Congratulations!',89, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (197, '1985-01-08', 'Amazing shot..',89, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (90, '479031.jpg', 'Noname/5/479031.jpg', 'Sport - 479031.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (90, '479031.jpg', '479031.jpg', 'Sport - 479031.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 90);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (198, '1985-01-08', 'Stunning capture! :-)',90, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (199, '1985-01-08', 'nice shot =) ',90, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (200, '1985-01-08', 'nice shot =) ',90, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (91, 'balloon.jpg', 'Noname/5/balloon.jpg', 'Sport - balloon.jpg image', '2009-12-18', 5, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (91, 'balloon.jpg', 'balloon.jpg', 'Sport - balloon.jpg image', '2009-12-18', 5, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 91);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (201, '1985-01-08', 'this is extremely Good:) Congratulations!',91, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (202, '1985-01-08', 'that is a beautiful flower with great colours ',91, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (203, '1985-01-08', 'Wonderful.',91, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (204, '1985-01-08', 'nice shot =) ',91, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (92, 'hghjump.jpg', 'Noname/5/hghjump.jpg', 'Sport - hghjump.jpg image', '2009-12-18', 5, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (92, 'hghjump.jpg', 'hghjump.jpg', 'Sport - hghjump.jpg image', '2009-12-18', 5, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 92);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (205, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',92, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (206, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',92, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (207, '1985-01-08', 'I Think this is Art!',92, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (93, 'pinn01.jpg', 'Noname/5/pinn01.jpg', 'Sport - pinn01.jpg image', '2009-12-18', 5, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (93, 'pinn01.jpg', 'pinn01.jpg', 'Sport - pinn01.jpg image', '2009-12-18', 5, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 93);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (208, '1985-01-08', 'Bellissima macro!',93, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (94, 'pinn04.jpg', 'Noname/5/pinn04.jpg', 'Sport - pinn04.jpg image', '2009-12-18', 5, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (94, 'pinn04.jpg', 'pinn04.jpg', 'Sport - pinn04.jpg image', '2009-12-18', 5, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 94);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (209, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',94, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (210, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',94, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (211, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',94, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (95, 'pinn29.jpg', 'Noname/5/pinn29.jpg', 'Sport - pinn29.jpg image', '2009-12-18', 5, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (95, 'pinn29.jpg', 'pinn29.jpg', 'Sport - pinn29.jpg image', '2009-12-18', 5, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 95);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (212, '1985-01-08', 'Beautiful colours. Nice close up. ',95, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (213, '1985-01-08', 'this is extremely Good:) Congratulations!',95, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (214, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',95, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (96, 'pinn39.jpg', 'Noname/5/pinn39.jpg', 'Sport - pinn39.jpg image', '2009-12-18', 5, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (96, 'pinn39.jpg', 'pinn39.jpg', 'Sport - pinn39.jpg image', '2009-12-18', 5, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 96);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (215, '1985-01-08', 'love every thing about this picture, really beautiful... :))',96, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (216, '1985-01-08', 'love every thing about this picture, really beautiful... :))',96, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (217, '1985-01-08', 'Wonderful.',96, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (97, 'pinn64.jpg', 'Noname/5/pinn64.jpg', 'Sport - pinn64.jpg image', '2009-12-18', 5, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (97, 'pinn64.jpg', 'pinn64.jpg', 'Sport - pinn64.jpg image', '2009-12-18', 5, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 97);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (218, '1985-01-08', 'love every thing about this picture, really beautiful... :))',97, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (219, '1985-01-08', 'Bellísima.!!! saludos.',97, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (220, '1985-01-08', 'fantastic shot !!!!!!',97, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (98, 'sa28.jpg', 'Noname/5/sa28.jpg', 'Sport - sa28.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (98, 'sa28.jpg', 'sa28.jpg', 'Sport - sa28.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 98);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (221, '1985-01-08', 'that is a beautiful flower with great colours ',98, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (222, '1985-01-08', 'fantastic shot !!!!!!',98, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (223, '1985-01-08', 'Stunning capture! :-)',98, 3);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (224, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',98, 3);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (99, 'swimmer.jpg', 'Noname/5/swimmer.jpg', 'Sport - swimmer.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (99, 'swimmer.jpg', 'swimmer.jpg', 'Sport - swimmer.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 99);
---------------------------------------------------------------------
@@ -464,87 +464,87 @@
INSERT INTO albums(album_id, name, description, shelf_id, created) VALUES (6, 'Underwater', 'Underwater pictures', 1, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (6, 'Underwater');
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (101, '45000.jpg', 'amarkhel/6/45000.jpg', 'Underwater - 45000.jpg image', '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (101, '45000.jpg', '45000.jpg', 'Underwater - 45000.jpg image', '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 101);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (225, '1985-01-08', 'nice shot =) ',101, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (226, '1985-01-08', 'Beautiful colours. Nice close up. ',101, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (102, '45001.jpg', 'amarkhel/6/45001.jpg', 'Underwater - 45001.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (102, '45001.jpg', '45001.jpg', 'Underwater - 45001.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 102);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (227, '1985-01-08', 'this is extremely Good:) Congratulations!',102, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (228, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',102, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (229, '1985-01-08', 'nice shot =) ',102, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (103, '45002.jpg', 'amarkhel/6/45002.jpg', 'Underwater - 45002.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (103, '45002.jpg', '45002.jpg', 'Underwater - 45002.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 103);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (104, '45003.jpg', 'amarkhel/6/45003.jpg', 'Underwater - 45003.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (104, '45003.jpg', '45003.jpg', 'Underwater - 45003.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 104);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (230, '1985-01-08', 'Very *lovely*',104, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (231, '1985-01-08', 'Stunning capture! :-)',104, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (232, '1985-01-08', '++Beautiful',104, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (233, '1985-01-08', 'Such a lovely colour azaga!',104, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (105, '45004.jpg', 'amarkhel/6/45004.jpg', 'Underwater - 45004.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (105, '45004.jpg', '45004.jpg', 'Underwater - 45004.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 105);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (106, '45005.jpg', 'amarkhel/6/45005.jpg', 'Underwater - 45005.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (106, '45005.jpg', '45005.jpg', 'Underwater - 45005.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 106);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (234, '1985-01-08', 'Such a lovely colour azaga!',106, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (235, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',106, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (236, '1985-01-08', 'Wonderful.',106, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (107, '45006.jpg', 'amarkhel/6/45006.jpg', 'Underwater - 45006.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (107, '45006.jpg', '45006.jpg', 'Underwater - 45006.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 107);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (237, '1985-01-08', 'Wonderful.',107, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (238, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',107, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (239, '1985-01-08', 'fantastic shot !!!!!!',107, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (108, '45009.jpg', 'amarkhel/6/45009.jpg', 'Underwater - 45009.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (108, '45009.jpg', '45009.jpg', 'Underwater - 45009.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 108);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (240, '1985-01-08', 'nice shot =) ',108, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (241, '1985-01-08', 'love every thing about this picture, really beautiful... :))',108, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (109, '45010.jpg', 'amarkhel/6/45010.jpg', 'Underwater - 45010.jpg image', '2009-12-18', 6, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (109, '45010.jpg', '45010.jpg', 'Underwater - 45010.jpg image', '2009-12-18', 6, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 109);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (242, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',109, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (243, '1985-01-08', 'love every thing about this picture, really beautiful... :))',109, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (244, '1985-01-08', 'nice shot =) ',109, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (245, '1985-01-08', 'Beautiful colours. Nice close up. ',109, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (110, '45012.jpg', 'amarkhel/6/45012.jpg', 'Underwater - 45012.jpg image', '2009-12-18', 6, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (110, '45012.jpg', '45012.jpg', 'Underwater - 45012.jpg image', '2009-12-18', 6, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 110);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (111, '45013.jpg', 'amarkhel/6/45013.jpg', 'Underwater - 45013.jpg image', '2009-12-18', 6, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (111, '45013.jpg', '45013.jpg', 'Underwater - 45013.jpg image', '2009-12-18', 6, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 111);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (112, '45014.jpg', 'amarkhel/6/45014.jpg', 'Underwater - 45014.jpg image', '2009-12-18', 6, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (112, '45014.jpg', '45014.jpg', 'Underwater - 45014.jpg image', '2009-12-18', 6, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 112);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (113, '45016.jpg', 'amarkhel/6/45016.jpg', 'Underwater - 45016.jpg image', '2009-12-18', 6, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (113, '45016.jpg', '45016.jpg', 'Underwater - 45016.jpg image', '2009-12-18', 6, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 113);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (246, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',113, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (114, '45017.jpg', 'amarkhel/6/45017.jpg', 'Underwater - 45017.jpg image', '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (114, '45017.jpg', '45017.jpg', 'Underwater - 45017.jpg image', '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 114);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (115, '45018.jpg', 'amarkhel/6/45018.jpg', 'Underwater - 45018.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (115, '45018.jpg', '45018.jpg', 'Underwater - 45018.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 115);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (247, '1985-01-08', 'fantastic shot !!!!!!',115, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (248, '1985-01-08', 'Such a lovely colour azaga!',115, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (249, '1985-01-08', '++Beautiful',115, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (250, '1985-01-08', 'Stunning capture! :-)',115, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (116, '45019.jpg', 'amarkhel/6/45019.jpg', 'Underwater - 45019.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (116, '45019.jpg', '45019.jpg', 'Underwater - 45019.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 116);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (251, '1985-01-08', 'Perfecft!',116, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (252, '1985-01-08', 'Stunning capture! :-)',116, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (117, '45020.jpg', 'amarkhel/6/45020.jpg', 'Underwater - 45020.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (117, '45020.jpg', '45020.jpg', 'Underwater - 45020.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 117);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (253, '1985-01-08', 'fantastic shot !!!!!!',117, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (254, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',117, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (255, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',117, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (118, '45021.jpg', 'amarkhel/6/45021.jpg', 'Underwater - 45021.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (118, '45021.jpg', '45021.jpg', 'Underwater - 45021.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 118);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (256, '1985-01-08', 'Gorgeous! Lovely color!',118, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (257, '1985-01-08', 'Amazing shot..',118, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (119, '45022.jpg', 'amarkhel/6/45022.jpg', 'Underwater - 45022.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (119, '45022.jpg', '45022.jpg', 'Underwater - 45022.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 119);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (258, '1985-01-08', 'Bellísima.!!! saludos.',119, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (259, '1985-01-08', 'Wonderful.',119, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (260, '1985-01-08', '++Beautiful',119, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (261, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',119, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (120, '45023.jpg', 'amarkhel/6/45023.jpg', 'Underwater - 45023.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (120, '45023.jpg', '45023.jpg', 'Underwater - 45023.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 120);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (262, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',120, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (263, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',120, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (264, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',120, 1);
-INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (121, '45024.jpg', 'amarkhel/6/45024.jpg', 'Underwater - 45024.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (121, '45024.jpg', '45024.jpg', 'Underwater - 45024.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 121);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (265, '1985-01-08', 'that is a beautiful flower with great colours ',121, 1);
INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (266, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',121, 1);
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13461 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/ui and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 09:52:12 -0400 (Thu, 09 Apr 2009)
New Revision: 13461
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/4/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/3/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/1/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/2/
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
Log:
Refactoring FileManager
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -62,7 +62,12 @@
return;
}
validationSuccess = true;
- albumAction.addAlbum(album);
+ try{
+ albumAction.addAlbum(album);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_SAVING_ERROR);
+ return;
+ }
Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, null);
Events.instance().raiseEvent(Constants.ALBUM_ADDED_EVENT, album);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
@@ -86,15 +91,25 @@
@Restrict("#{s:hasRole('admin')}")
public void editAlbum(Album album){
- albumAction.editAlbum(album);
+ try{
+ albumAction.editAlbum(album);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_SAVING_ERROR);
+ return;
+ }
Events.instance().raiseEvent(Constants.ALBUM_EDITED_EVENT, album);
}
@Restrict("#{s:hasRole('admin')}")
public void deleteAlbum(Album album){
- String albumName = album.getId().toString();
- albumAction.deleteAlbum(album);
- Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT, album, user.getLogin(), albumName);
+ String pathToDelete = album.getPath();
+ try{
+ albumAction.deleteAlbum(album);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_DELETING_ERROR);
+ return;
+ }
+ Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT, album, pathToDelete);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -21,7 +21,6 @@
package org.richfaces.realworld.manager;
import java.io.Serializable;
-import java.util.List;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
@@ -151,12 +150,12 @@
}
@Observer(Constants.ALBUM_DELETED_EVENT)
- public void onAlbumDeleted(Album album, String... parameters ){
+ public void onAlbumDeleted(Album album, String path){
model.resetModel(NavigationEnum.ALL_ALBUMS, model.getSelectedUser(), model.getSelectedShelf(), null, null, null);
}
@Observer(Constants.SHELF_DELETED_EVENT)
- public void onShelfDeleted(Shelf shelf, List<String> parameters){
+ public void onShelfDeleted(Shelf shelf, String path){
model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null);
}
@@ -182,7 +181,7 @@
public void showFileUpload(){
if(!(user.getShelfs().size() > 0)){
- pushEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_CREATE_ERROR);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_UPLOAD_SHOW_ERROR);
return;
}
model.resetModel(NavigationEnum.FILE_UPLOAD, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
@@ -221,6 +220,10 @@
model.setSelectedTag(metatag);
}
+ public void showError(String error){
+ pushEvent(Constants.ADD_ERROR_EVENT, error);
+ }
+
public boolean isUserImage(Image image){
if(image == null || image.getAlbum() == null || image.getAlbum().getOwner() == null){
return false;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -65,7 +65,12 @@
private void handleAlbum(Album dragValue, Shelf dropValue) {
dropValue.addAlbum(dragValue);
- albumAction.editAlbum(dragValue);
+ try{
+ albumAction.editAlbum(dragValue);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ERROR_IN_DB);
+ return;
+ }
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@@ -73,19 +78,13 @@
if(dragValue.getAlbum().equals(dropValue)){
return;
}
- String newPath = generateNewPathOfImage(dragValue, dropValue);
- dragValue.setPath(newPath);
dropValue.addImage(dragValue);
- albumAction.editAlbum(dropValue);
+ try{
+ albumAction.editAlbum(dropValue);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ERROR_IN_DB);
+ return;
+ }
Events.instance().raiseEvent(Constants.DNDUPLOADED_EVENT, dragValue);
}
-
- private String generateNewPathOfImage(Image dragValue, Album dropValue) {
- String fileNameOld = dragValue.getPath();
- int lastIndexOf = dragValue.getPath().lastIndexOf(Constants.SLASH);
- String prevPathEnd = dragValue.getPath().substring(lastIndexOf);
- String fileNameNew = user.getLogin() + Constants.SLASH + dropValue.getId() + Constants.SLASH + prevPathEnd;
- fileManager.renameImage(fileNameOld, fileNameNew);
- return fileNameNew;
- }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -20,23 +20,11 @@
*/
package org.richfaces.realworld.manager;
-import java.awt.Graphics2D;
import java.awt.RenderingHints;
-import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageInputStream;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
@@ -50,6 +38,8 @@
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
+import org.richfaces.realworld.util.FileUtils;
+import org.richfaces.realworld.util.ImageDimension;
@Name("fileManager")
@Scope(ScopeType.APPLICATION)
@@ -100,278 +90,80 @@
return null;
}
- public boolean isDirectoryPresent(String directory) {
- final File file = getFileByPath(directory);
- return file.exists() && file.isDirectory();
- }
-
@Restrict("#{s:hasRole('admin')}")
@Observer(Constants.ALBUM_DELETED_EVENT)
- public void deleteDirectory(Album album, String... directories) {
- deleteDirectory(directories);
+ public void onAlbumDeleted(Album album, String path) {
+ deleteDirectory(path);
}
-
- @Observer(Constants.USER_DELETED_EVENT)
- public void deleteDirectory(String... directories){
- final File file = getFileByPath(joinFiles(directories).toString());
- deleteDirectory(file);
- }
- private void deleteDirectory(File file) {
- if (file.exists()) {
- for (String f : file.list()) {
- final File temp = new File(file, f);
- if(temp.isDirectory()){
- deleteDirectory(temp);
- }else{
- temp.delete();
- }
- }
- file.delete();
- }
- }
-
- private String joinFiles(String... files) {
- final StringBuilder res = new StringBuilder();
- for (String file : files) {
- res.append(file).append(File.pathSeparatorChar);
- }
- return res.substring(0, res.length() - 1);
+ @Restrict("#{s:hasRole('admin')}")
+ @Observer(Constants.SHELF_DELETED_EVENT)
+ public void onShelfDeleted(Shelf shelf, String path) {
+ deleteDirectory(path);
}
- @Restrict("#{s:hasRole('admin')}")
- public boolean renameDirectory(String directoryOld, String directoryNew) {
- final File fileOld = getFileByPath(directoryOld);
- final File fileNew = getFileByPath(directoryNew);
-
- createDirectoryIfNotExist(directoryNew);
- if (fileNew.exists()) {
- if (fileNew.isDirectory()) {
- return false;
- } else {
- fileNew.delete();
- }
- }
- fileOld.renameTo(fileNew);
- return true;
+ @Observer(Constants.USER_DELETED_EVENT)
+ public void onUserDeleted(User user){
+ deleteDirectory(user.getPath());
}
@Restrict("#{s:hasRole('admin')}")
- public void addDirectory(String... directories) {
- final StringBuilder directory = new StringBuilder();
- for (String chunk : directories) {
- directory.append(chunk);
- }
-
- final File file = getFileByPath(directory.toString());
- file.mkdirs();
- }
-
- @Restrict("#{s:hasRole('admin')}")
public boolean saveAvatar(String path, User user) {
- return writeFile(Constants.SLASH + user.getLogin() +
+ return writeFile(user.getPath() +
Constants.AVATAR_JPG, path, "", Constants.AVATAR_SIZE, true);
}
@Restrict("#{s:hasRole('admin')}")
- public void renameImage(String fileNameOld, String fileNameNew) {
- createDirectoryIfNotExist(fileNameNew);
- renameImage(getFileByPath(fileNameNew), getFileByPath(fileNameOld));
-
- renameImage(getFileByPath(transformPath(fileNameNew, Constants._MEDIUM)),
- getFileByPath(transformPath(fileNameOld, Constants._MEDIUM)));
-
- renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL80)),
- getFileByPath(transformPath(fileNameOld, Constants._SMALL80)));
-
- renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL120)),
- getFileByPath(transformPath(fileNameOld, Constants._SMALL120)));
-
- renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL160)),
- getFileByPath(transformPath(fileNameOld, Constants._SMALL160)));
-
- renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL200)),
- getFileByPath(transformPath(fileNameOld, Constants._SMALL200)));
- }
-
- @Restrict("#{s:hasRole('admin')}")
@Observer(Constants.IMAGE_DELETED_EVENT)
- public void deleteImage(Image image, String fileName) {
- deleteImage(getFileByPath(fileName));
- deleteImage(getFileByPath(transformPath(fileName, Constants._MEDIUM)));
- deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL80)));
- deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL120)));
- deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL160)));
- deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL200)));
+ public void deleteImage(Image image, String path) {
+ for(ImageDimension d : ImageDimension.values()){
+ FileUtils.deleteFile(getFileByPath(transformPath(path, d.getFilePostfix())));
+ }
}
@Restrict("#{s:hasRole('admin')}")
public boolean addImage(String fileName, String tempFilePath) {
createDirectoryIfNotExist(fileName);
- if(!writeFile(fileName, tempFilePath, Constants._SMALL80, Constants.SMALL_80_SIZE, true)){
- return false;
- }
- if(!writeFile(fileName, tempFilePath, Constants._SMALL120, Constants.SMALL_120_SIZE, true)){
- return false;
- }
- if(!writeFile(fileName, tempFilePath, Constants._SMALL160, Constants.SMALL_160_SIZE, true)){
- return false;
- }
- if(!writeFile(fileName, tempFilePath, Constants._SMALL200, Constants.SMALL_200_SIZE, true)){
- return false;
- }
- if(!writeFile(fileName, tempFilePath, Constants._MEDIUM, Constants.MEDIUM_SIZE, true)){
- return false;
- }
- if(!writeOriginalFile(fileName, tempFilePath, true)){
- return false;
- }
+ for(ImageDimension d : ImageDimension.values()){
+ if(!writeFile(fileName, tempFilePath, d.getFilePostfix(), d.getX(), true)){
+ return false;
+ }
+ }
return true;
}
-
- public static BufferedImage bitmapToImage(String data, String format) throws IOException {
- final InputStream inb = new FileInputStream(data);
- final ImageReader rdr = ImageIO.getImageReadersByFormatName(format).next();
- final ImageInputStream imageInput = ImageIO.createImageInputStream(inb);
- rdr.setInput(imageInput);
- final BufferedImage image = rdr.read(0);
- inb.close();
- return image;
- }
-
- public static void imageToBitmap(BufferedImage image, String data, String format) throws IOException {
- final OutputStream inb = new FileOutputStream(data);
- final ImageWriter wrt = ImageIO.getImageWritersByFormatName(format).next();
- final ImageInputStream imageInput = ImageIO.createImageOutputStream(inb);
- wrt.setOutput(imageInput);
- wrt.write(image);
- inb.close();
- }
-
- /**
- * Convenience method that returns a scaled instance of the
- * provided {@code BufferedImage}.
- *
- * @param img the original image to be scaled
- * @param targetWidth the desired width of the scaled instance,
- * in pixels
- * @param targetHeight the desired height of the scaled instance,
- * in pixels
- * @param hint one of the rendering hints that corresponds to
- * {@code RenderingHints.KEY_INTERPOLATION} (e.g.
- * {@code RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR},
- * {@code RenderingHints.VALUE_INTERPOLATION_BILINEAR},
- * {@code RenderingHints.VALUE_INTERPOLATION_BICUBIC})
- * @param higherQuality if true, this method will use a multi-step
- * scaling technique that provides higher quality than the usual
- * one-step technique (only useful in downscaling cases, where
- * {@code targetWidth} or {@code targetHeight} is
- * smaller than the original dimensions, and generally only when
- * the {@code BILINEAR} hint is specified)
- * @return a scaled version of the original {@code BufferedImage}
- */
- public static BufferedImage getScaledInstance(BufferedImage img,
- int targetWidth,
- int targetHeight,
- Object hint,
- boolean higherQuality) {
- final int type = img.getTransparency() == Transparency.OPAQUE ?
- BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
- BufferedImage ret = (BufferedImage) img;
- int w;
- int h;
- if (higherQuality) {
- // Use multi-step technique: start with original size, then
- // scale down in multiple passes with drawImage()
- // until the target size is reached
- w = img.getWidth();
- h = img.getHeight();
- } else {
- // Use one-step technique: scale directly from original
- // size to target size with a single drawImage() call
- w = targetWidth;
- h = targetHeight;
- }
-
- do {
- if (higherQuality && w > targetWidth) {
- w /= 2;
- if (w < targetWidth) {
- w = targetWidth;
- }
- }
-
- if (higherQuality && h > targetHeight) {
- h /= 2;
- if (h < targetHeight) {
- h = targetHeight;
- }
- }
-
- final BufferedImage tmp = new BufferedImage(w, h, type);
- final Graphics2D g2 = tmp.createGraphics();
- g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint);
- g2.drawImage(ret, 0, 0, w, h, null);
- g2.dispose();
-
- ret = tmp;
- } while (w != targetWidth || h != targetHeight);
-
- return ret;
- }
-
- public boolean writeOriginalFile(String newFileName, String fileName,
- boolean includeUploadRoot){
- BufferedImage bsrc = null;
+
+ @Restrict("#{s:hasRole('admin')}")
+ public boolean writeFile(String newFileName, String fileName,
+ String pattern, int size, boolean includeUploadRoot) {
+ BufferedImage bsrc = null;
try {
- bsrc = bitmapToImage(fileName, Constants.JPG);
+ bsrc = FileUtils.bitmapToImage(fileName, Constants.JPG);
} catch (IOException e1) {
return false;
}
- BufferedImage bdest = getScaledInstance(bsrc, bsrc.getWidth(), bsrc.getHeight(),
+ int i = bsrc.getWidth() > bsrc.getHeight() ? bsrc.getWidth() : bsrc.getHeight();
+ double d = (double) size / i;
+ Double yy = ((Double) d * bsrc.getWidth());
+ int width = yy.intValue();
+ yy = ((Double) d * bsrc.getHeight());
+ int height = yy.intValue();
+ // Too small picture or original size
+ if (width > bsrc.getWidth() || height > bsrc.getHeight() || size == 0) {
+ width = bsrc.getWidth();
+ height = bsrc.getHeight();
+ }
+ BufferedImage bdest = FileUtils.getScaledInstance(bsrc, width, height,
RenderingHints.VALUE_INTERPOLATION_BICUBIC, true);
String dest = includeUploadRoot ? this.uploadRootPath
- + newFileName : newFileName;
+ + transformPath(newFileName, pattern) : transformPath(
+ newFileName, pattern);
try {
- imageToBitmap(bdest, dest, Constants.JPG);
+ FileUtils.imageToBitmap(bdest, dest, Constants.JPG);
} catch (IOException ex) {
return false;
}
return true;
- }
- @Restrict("#{s:hasRole('admin')}")
- public boolean writeFile(String newFileName, String fileName,
- String pattern, int size, boolean includeUploadRoot) {
- BufferedImage bsrc = null;
- try {
- bsrc = bitmapToImage(fileName, Constants.JPG);
- } catch (IOException e1) {
- return false;
- }
- int i = bsrc.getWidth() > bsrc.getHeight() ? bsrc.getWidth() : bsrc
- .getHeight();
- double d = (double) size / i;
- Double yy = ((Double) d * bsrc.getWidth());
- int width = yy.intValue();
- yy = ((Double) d * bsrc.getHeight());
- int height = yy.intValue();
- //Too small picture
- if(width > bsrc.getWidth() || height > bsrc.getHeight()){
- width = bsrc.getWidth();
- height = bsrc.getHeight();
- }
- BufferedImage bdest = getScaledInstance(bsrc, width, height,
- RenderingHints.VALUE_INTERPOLATION_BICUBIC, true);
- String dest = includeUploadRoot ? this.uploadRootPath
- + transformPath(newFileName, pattern) : transformPath(
- newFileName, pattern);
- try {
- imageToBitmap(bdest, dest, Constants.JPG);
- } catch (IOException ex) {
- return false;
- }
- return true;
- }
+ }
public String transformPath(String target, String substitute) {
final String begin = target.substring(0, target.lastIndexOf(Constants.DOT));
@@ -379,25 +171,16 @@
return begin + substitute + end;
}
- private void deleteImage(File file) {
- if (file.exists()) {
- file.delete();
- }
+ public File getFileByAbsolutePath(String path) {
+ return new File(path);
+ }
+
+ private void deleteDirectory(String directory){
+ final File file = getFileByPath(directory);
+ FileUtils.deleteDirectory(file, false);
}
-
- public String getPathOfImage(String path) {
- final int i = path.lastIndexOf(Constants.SLASH);
- return path.substring(i);
- }
-
- private void renameImage(File fileNew, File fileOld) {
- if (fileNew.exists()) {
- fileNew.delete();
- }
- fileOld.renameTo(fileNew);
- }
-
- private void createDirectoryIfNotExist(String fileNameNew) {
+
+ private void createDirectoryIfNotExist(String fileNameNew) {
final int lastIndexOf = fileNameNew.lastIndexOf(Constants.SLASH);
if (lastIndexOf > 0) {
final String directory = fileNameNew.substring(0, lastIndexOf);
@@ -407,20 +190,4 @@
}
}
}
-
- public boolean isImagePresent(String fileName) {
- return getFileByPath(fileName) != null && getFileByPath(fileName).exists() && !getFileByPath(fileName).isDirectory();
- }
-
- @Restrict("#{s:hasRole('admin')}")
- @Observer(Constants.SHELF_DELETED_EVENT)
- public void deleteDirectories(Shelf shelf, List<String> directoriesToDelete) {
- for (String directory : directoriesToDelete) {
- deleteDirectory(directory);
- }
- }
-
- public File getFileByAbsolutePath(String path) {
- return new File(path);
- }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -74,28 +74,31 @@
try {
extractMetadata(item, image);
} catch (Exception e1) {
- addError(item, image);
+ addError(item, image, Constants.FILE_PROCESSING_ERROR);
return;
}
image.setAlbum(model.getSelectedAlbum());
if(model.getSelectedAlbum() == null){
- addError(item, image);
+ addError(item, image, Constants.NO_ALBUM_TO_DOWNLOAD_ERROR);
return;
}
- String newPath = Constants.SLASH + model.getSelectedAlbum().getOwner().getLogin() + Constants.SLASH + model.getSelectedAlbum().getId() + Constants.SLASH +item.getFileName();
- image.setPath(newPath);
- if(!fileManager.addImage(newPath, item.getFile().getPath())){
- addError(item, image);
+ try{
+ imageAction.addImage(image);
+ }catch(Exception e){
+ addError(item, image, Constants.IMAGE_SAVING_ERROR);
return;
}
+ if(!fileManager.addImage(image.getFullPath(), item.getFile().getPath())){
+ addError(item, image, Constants.FILE_SAVE_ERROR);
+ return;
+ }
fileWrapper.getFiles().add(image);
- imageAction.addImage(image);
Events.instance().raiseEvent(Constants.IMAGE_ADDED_EVENT);
item.getFile().delete();
}
- private void addError(UploadItem item, Image image) {
- fileWrapper.getErrorFiles().add(image);
+ private void addError(UploadItem item, Image image, String error) {
+ fileWrapper.onFileUploadError(image, error);
item.getFile().delete();
}
@@ -105,6 +108,7 @@
image.setDescription(item.getFileName());
image.setName(item.getFileName());
image.setSize(item.getFileSize());
+ image.setPath(item.getFileName());
image.setAllowComments(true);
return image;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -54,14 +54,24 @@
@Restrict("#{s:hasRole('admin')}")
public void deleteImage(Image image) {
- String imagePath = image.getPath();
- imageAction.deleteImage(image);
- Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT, image , imagePath);
+ String pathToDelete = image.getFullPath();
+ try{
+ imageAction.deleteImage(image);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_DELETING_ERROR);
+ return;
+ }
+ Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT, image, pathToDelete);
}
@Restrict("#{s:hasRole('admin')}")
public void editImage(Image image) {
- imageAction.editImage(image);
+ try{
+ imageAction.editImage(image);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_SAVING_ERROR);
+ return;
+ }
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
}
@@ -79,13 +89,23 @@
comment.setImage(image);
comment.setDate(new Date());
comment.setMessage(message);
- imageAction.addComment(comment);
+ try{
+ imageAction.addComment(comment);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SAVE_COMMENT_ERROR);
+ return;
+ }
Events.instance().raiseEvent(Constants.CLEAR_EDITOR_EVENT, "");
}
@Restrict("#{s:hasRole('admin')}")
public void deleteComment(Comment comment) {
- imageAction.deleteComment(comment);
+ try{
+ imageAction.deleteComment(comment);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DELETE_COMMENT_ERROR);
+ return;
+ }
}
public List<MetaTag> popularTags() {
@@ -140,4 +160,4 @@
return url.toString();
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -21,7 +21,6 @@
package org.richfaces.realworld.manager;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import org.jboss.seam.ScopeType;
@@ -33,7 +32,6 @@
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
-import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
@@ -65,7 +63,12 @@
public void addShelf(Shelf shelf) {
validationSuccess = true;
shelf.setPreDefined(false);
- shelfAction.addShelf(shelf);
+ try{
+ shelfAction.addShelf(shelf);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SHELF_SAVING_ERROR);
+ return;
+ }
Events.instance().raiseEvent(Constants.SHELF_ADDED_EVENT, shelf);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@@ -77,19 +80,25 @@
@Restrict("#{s:hasRole('admin')}")
public void editShelf(Shelf shelf) {
shelf.setPreDefined(false);
- shelfAction.editShelf(shelf);
+ try{
+ shelfAction.editShelf(shelf);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SHELF_SAVING_ERROR);
+ return;
+ }
Events.instance().raiseEvent(Constants.SHELF_EDITED_EVENT, shelf);
}
@Restrict("#{s:hasRole('admin')}")
public void deleteShelf(Shelf shelf) {
- //Update domain model
- List<String> directoriesToDelete = new ArrayList<String>();
- for (Album a : shelf.getAlbums()) {
- directoriesToDelete.add(user.getLogin() + Constants.SLASH + a.getId());
- }
- shelfAction.deleteShelf(shelf);
- Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT, shelf, directoriesToDelete);
+ String pathToDelete = shelf.getPath();
+ try{
+ shelfAction.deleteShelf(shelf);
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SHELF_DELETING_ERROR);
+ return;
+ }
+ Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT, shelf, pathToDelete);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -94,8 +94,12 @@
avatarData.delete();
avatarData = null;
user.setHasAvatar(true);
+ }try{
+ user = userAction.updateUser();
+ }catch(Exception e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.UPDATE_USER_ERROR);
+ return;
}
- user = userAction.updateUser();
}
@Observer(Constants.CANCEL_EDIT_USER_EVENT)
@@ -114,7 +118,7 @@
}
@Observer(Constants.ALBUM_DELETED_EVENT)
- public void onAlbumDeleted(Album album, String... parameters){
+ public void onAlbumDeleted(Album album, String path){
user.updateStatistics();
}
@@ -124,7 +128,7 @@
}
@Observer(Constants.SHELF_DELETED_EVENT)
- public void onShelfDeleted(Shelf shelf, List<String> directories){
+ public void onShelfDeleted(Shelf shelf, String path){
user.updateStatistics();
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -38,7 +38,7 @@
return;
}
if(im.getAlbum().getShelf().isShared() || (identity.hasRole(Constants.ADMIN_ROLE) && im.getAlbum().getOwner().getLogin().equals(credentials.getUsername()))){
- imageLoader.paintImage(out, im.getPath());
+ imageLoader.paintImage(out, im.getFullPath());
}else{
return;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -43,19 +43,30 @@
private List<Image> files = new ArrayList<Image>();
- private List<Image> errorFiles = new ArrayList<Image>();
+ private List<ErrorImage> errorFiles = new ArrayList<ErrorImage>();
- public String getErrorNames(){
- StringBuilder s = new StringBuilder();
- for(int i = 0; i < errorFiles.size(); i++){
- Image im = errorFiles.get(i);
- s.append(im.getName());
- if(!(i == errorFiles.size() - 1)){
- s.append(" ,");
- }
+ class ErrorImage{
+ private Image image;
+ private String errorDescription;
+ ErrorImage(Image i, String description){
+ image = i;
+ errorDescription = description;
}
- return s.toString();
+
+ public Image getImage() {
+ return image;
+ }
+ public void setImage(Image image) {
+ this.image = image;
+ }
+ public String getErrorDescription() {
+ return errorDescription;
+ }
+ public void setErrorDescription(String errorDescription) {
+ this.errorDescription = errorDescription;
+ }
}
+
public int getSize() {
return getFiles().size();
}
@@ -80,6 +91,19 @@
complete = false;
}
+ public void onFileUploadError(Image image, String error){
+ ErrorImage e = new ErrorImage(image, error);
+ errorFiles.add(e);
+ }
+
+ public Image getErrorImage(ErrorImage e){
+ return e.getImage();
+ }
+
+ public String getErrorDescription(ErrorImage e){
+ return e.getErrorDescription();
+ }
+
public boolean isComplete() {
return complete;
}
@@ -88,11 +112,11 @@
this.complete = complete;
}
- public List<Image> getErrorFiles() {
+ public List<ErrorImage> getErrorFiles() {
return errorFiles;
}
- public void setErrorFiles(List<Image> errorFiles) {
+ public void setErrorFiles(List<ErrorImage> errorFiles) {
this.errorFiles = errorFiles;
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -6,6 +6,8 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.richfaces.realworld.service.Constants;
+import org.richfaces.realworld.util.ImageDimension;
/**
* @author Andrey Markavtsov
@@ -15,65 +17,9 @@
@Scope(ScopeType.EVENT)
public class ImageSizeHelper {
- static final int DEFAULT_VALUE = 120;
-
- int value = DEFAULT_VALUE;
-
- public static enum ImageDimension {
-
- SIZE_80(80), SIZE_120(120), SIZE_160(160), SIZE_200(200);
-
- final static String CSS_CLASS = "preview_box_photo_";
- final static String FILE_POSTFIX = "_small";
- final static String IMAGE_BG = "/img/shell/frame_photo_%1$d.png";
- final static String IMAGE_BG_STYLE = "width: %1$dpx; height: %1$dpx";
-
- int x;
- String bgStyle;
- String cssClass;
- String imageBgSrc;
- String filePostfix;
-
- private ImageDimension(int x) {
- this.x = x;
- this.bgStyle = String.format(IMAGE_BG_STYLE, x + 20);
- cssClass = CSS_CLASS + x;
- imageBgSrc = String.format(IMAGE_BG, (x == 160) ? 200 : x);
- filePostfix = FILE_POSTFIX + x;
- }
-
- public int getX() {
- return x;
- }
-
- public String getCssClass() {
- return cssClass;
- }
-
- public String getImageBg() {
- return imageBgSrc;
- }
-
- public String getImageBgStyle() {
- return bgStyle;
- }
-
- public String getFilePostfix() {
- return filePostfix;
- }
-
- public static ImageDimension getInstance(int x) {
- ImageDimension [] all = values();
- for (int i=0; i<all.length; i++) {
- if (all[i].x == x) {
- return all[i];
- }
- }
- return values()[DEFAULT_VALUE];
- }
- };
+ int value = Constants.DEFAULT_IMAGE_SIZEVALUE;
- ImageDimension currentDimension = ImageDimension.getInstance(DEFAULT_VALUE);
+ ImageDimension currentDimension = ImageDimension.getInstance(Constants.DEFAULT_IMAGE_SIZEVALUE);
public ImageDimension getCurrentDimension() {
return currentDimension;
@@ -85,6 +31,6 @@
public void setValue(int value) {
currentDimension = ImageDimension.getInstance(value);
- this.value = currentDimension.x;
+ this.value = currentDimension.getX();
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -46,7 +46,7 @@
@Destroy
public void destroy()throws IOException {
- FileUtils.deleteDirectory(uploadRoot);
+ FileUtils.deleteDirectory(uploadRoot, true);
}
void resolveImageFolder() {
@@ -85,7 +85,7 @@
if (uploadRootPath != null) {
uploadRoot = new File(uploadRootPath);
if (uploadRoot.exists()) {
- FileUtils.deleteDirectory(uploadRoot);
+ FileUtils.deleteDirectory(uploadRoot, true);
}
uploadRoot.mkdir();
this.uploadRootPath = uploadRoot.getCanonicalPath();
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -1,8 +1,17 @@
package org.richfaces.realworld.util;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.Transparency;
+import java.awt.image.BufferedImage;
import java.io.*;
import java.util.zip.*;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+
public class FileUtils {
private static final String JPEG = "jpeg";
@@ -65,14 +74,17 @@
}
}
- public static void deleteDirectory(File dir){
+ public static boolean deleteDirectory(File dir , boolean isInitialDelete){
if (dir.isDirectory()) {
if (dir.exists()) {
for (File child : dir.listFiles()) {
try{
- deleteDirectory(child);
+ deleteDirectory(child, isInitialDelete);
}catch(Exception e){
- continue;
+ if(isInitialDelete){
+ continue;
+ }
+ else return false;
}
}
}
@@ -85,5 +97,103 @@
}
}
dir.delete();
+ return true;
}
+
+ public static void deleteFile(File file) {
+ if (file.exists()) {
+ file.delete();
+ }
+ }
+
+ public static BufferedImage bitmapToImage(String data, String format) throws IOException {
+ final InputStream inb = new FileInputStream(data);
+ final ImageReader rdr = ImageIO.getImageReadersByFormatName(format).next();
+ final ImageInputStream imageInput = ImageIO.createImageInputStream(inb);
+ rdr.setInput(imageInput);
+ final BufferedImage image = rdr.read(0);
+ inb.close();
+ return image;
+ }
+
+ public static void imageToBitmap(BufferedImage image, String data, String format) throws IOException {
+ final OutputStream inb = new FileOutputStream(data);
+ final ImageWriter wrt = ImageIO.getImageWritersByFormatName(format).next();
+ final ImageInputStream imageInput = ImageIO.createImageOutputStream(inb);
+ wrt.setOutput(imageInput);
+ wrt.write(image);
+ inb.close();
+ }
+
+ /**
+ * Convenience method that returns a scaled instance of the
+ * provided {@code BufferedImage}.
+ *
+ * @param img the original image to be scaled
+ * @param targetWidth the desired width of the scaled instance,
+ * in pixels
+ * @param targetHeight the desired height of the scaled instance,
+ * in pixels
+ * @param hint one of the rendering hints that corresponds to
+ * {@code RenderingHints.KEY_INTERPOLATION} (e.g.
+ * {@code RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR},
+ * {@code RenderingHints.VALUE_INTERPOLATION_BILINEAR},
+ * {@code RenderingHints.VALUE_INTERPOLATION_BICUBIC})
+ * @param higherQuality if true, this method will use a multi-step
+ * scaling technique that provides higher quality than the usual
+ * one-step technique (only useful in downscaling cases, where
+ * {@code targetWidth} or {@code targetHeight} is
+ * smaller than the original dimensions, and generally only when
+ * the {@code BILINEAR} hint is specified)
+ * @return a scaled version of the original {@code BufferedImage}
+ */
+ public static BufferedImage getScaledInstance(BufferedImage img,
+ int targetWidth,
+ int targetHeight,
+ Object hint,
+ boolean higherQuality) {
+ final int type = img.getTransparency() == Transparency.OPAQUE ?
+ BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
+ BufferedImage ret = (BufferedImage) img;
+ int w;
+ int h;
+ if (higherQuality) {
+ // Use multi-step technique: start with original size, then
+ // scale down in multiple passes with drawImage()
+ // until the target size is reached
+ w = img.getWidth();
+ h = img.getHeight();
+ } else {
+ // Use one-step technique: scale directly from original
+ // size to target size with a single drawImage() call
+ w = targetWidth;
+ h = targetHeight;
+ }
+
+ do {
+ if (higherQuality && w > targetWidth) {
+ w /= 2;
+ if (w < targetWidth) {
+ w = targetWidth;
+ }
+ }
+
+ if (higherQuality && h > targetHeight) {
+ h /= 2;
+ if (h < targetHeight) {
+ h = targetHeight;
+ }
+ }
+
+ final BufferedImage tmp = new BufferedImage(w, h, type);
+ final Graphics2D g2 = tmp.createGraphics();
+ g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint);
+ g2.drawImage(ret, 0, 0, w, h, null);
+ g2.dispose();
+
+ ret = tmp;
+ } while (w != targetWidth || h != targetHeight);
+
+ return ret;
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-09 13:52:12 UTC (rev 13461)
@@ -29,7 +29,7 @@
user = em.merge(user);
em.remove(user);
em.flush();
- Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user.getLogin());
+ Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user);
}
}
}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-09 13:52:12 UTC (rev 13461)
@@ -19,7 +19,7 @@
<h:panelGroup>
<a4j:mediaOutput element="img"
createContent="#{imageLoader.paintImage}"
- value="#{fileManager.transformPath(img.path, '_small80')}">
+ value="#{fileManager.transformPath(img.fullPath, '_small80')}">
<f:param value="#{imageSizeHelper.currentDimension.x}" name="x" />
</a4j:mediaOutput>
<br />
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-04-09 13:52:12 UTC (rev 13461)
@@ -16,7 +16,7 @@
createContent="#{imageLoader.paintImage}"
styleClass="album-cover-image"
- value="#{fileManager.transformPath(album.coveringImage.path, '_small120')}">
+ value="#{fileManager.transformPath(album.coveringImage.fullPath, '_small120')}">
</a4j:mediaOutput>
<h:graphicImage rendered="#{album.isEmpty()}"
style="width:80px; height:80px;"
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-09 13:34:06 UTC (rev 13460)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-09 13:52:12 UTC (rev 13461)
@@ -22,7 +22,7 @@
<a4j:mediaOutput id="img" element="img"
createContent="#{imageLoader.paintImage}"
style="border : 2px solid #FFFFFF;"
- value="#{fileManager.transformPath(image.path, imageSizeHelper.currentDimension.filePostfix)}">
+ value="#{fileManager.transformPath(image.fullPath, imageSizeHelper.currentDimension.filePostfix)}">
<f:param value="#{imageSizeHelper.currentDimension.x}" name="x" />
</a4j:mediaOutput>
</a4j:commandLink>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13460 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-09 09:34:06 -0400 (Thu, 09 Apr 2009)
New Revision: 13460
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
Log:
add toltip for image
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13459 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 09:22:16 -0400 (Thu, 09 Apr 2009)
New Revision: 13459
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
Log:
id="#{myid}" removed from tag
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-09 12:17:30 UTC (rev 13458)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-09 13:22:16 UTC (rev 13459)
@@ -13,7 +13,7 @@
<a4j:loadScript src="/scripts/buttons.js" />
<richx:actionMapper>
- <a4j:outputPanel id="#{myid}" layout="block" style="#{style}" styleClass="realworldButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}"
+ <a4j:outputPanel layout="block" style="#{style}" styleClass="realworldButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}"
rendered="#{empty rendered or rendered}"
onmousedown="RF_RW_DEMO.toPressed(this)" onmouseup="RF_RW_DEMO.toReleased(this)" onmouseout="RF_RW_DEMO.toReleased(this)">
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13458 - in trunk/docs: userguide/en/src/main/docbook/modules and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-04-09 08:17:30 -0400 (Thu, 09 Apr 2009)
New Revision: 13458
Modified:
trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
https://jira.jboss.org/jira/browse/RF-5957 RF documentation version on project page and in the RF guides; versions are corrected in dev guide
Modified: trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml
===================================================================
--- trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-04-09 12:04:56 UTC (rev 13457)
+++ trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-04-09 12:17:30 UTC (rev 13458)
@@ -342,12 +342,12 @@
<para>The answer is yes. </para>
<para>Component provides two controllers groups for switching:</para>
<itemizedlist>
- <listitem>Page numbers for switching onto a particular page</listitem>
- <listitem>The controls of fast switching: "first",
+ <listitem><para>Page numbers for switching onto a particular page</para></listitem>
+ <listitem><para>The controls of fast switching: "first",
"last", "next",
"previous",
"fastforward",
- "fastrewind"</listitem>
+ "fastrewind"</para></listitem>
</itemizedlist>
<para>The controls of fast switching are created adding the facets component
with the corresponding name:</para>
@@ -648,16 +648,17 @@
<title>How to make html scrollbars in modalPanel?</title>
<para>The answer could be found on the RichFaces Users Forum:</para>
<itemizedlist>
- <listitem>
+ <listitem><para>
<ulink
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4062877#..."
>http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4062877#...</ulink>
- </listitem>
+ </para> </listitem>
<listitem>
+ <para>
<ulink
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&t=105412"
>http://www.jboss.com/index.html?module=bb&op=viewtopic&t=105412</ulink>
- </listitem>
+ </para> </listitem>
</itemizedlist>
</section>
@@ -948,10 +949,11 @@
<para> RichFaces currently does not use <emphasis>invokeOnComponent</emphasis>
because of the 2 reasons: </para>
<itemizedlist>
- <listitem> Compatibility with JSF 1.1 and MyFaces applications is
+ <listitem> <para>Compatibility with JSF 1.1 and MyFaces applications is
kept, due to a big amount of code used in corporate
- applications. </listitem>
+ applications. </para></listitem>
<listitem>
+ <para>
<emphasis> InvokeOnComponent</emphasis> works with already
known clientId, and works fine for communication between
widget and backed component, or updates content of already
@@ -960,7 +962,7 @@
as there is a choice for updatable components in application
logic, where it's necessary to navigate in a
components tree by the native id, with
- <code>findComponent()</code> methods. </listitem>
+ <code>findComponent()</code> methods.</para> </listitem>
</itemizedlist>
<para> Thus, for example, only entire dataTable can be updated in response (but
all Ajax core action components inside table work properly). </para>
@@ -1031,15 +1033,20 @@
<property>"IgnoreDupResponses"</property>
</emphasis> attribute appeared from 1.0.4 RC1 version and is used on
the client for response ignoring after an Ajax request if a newer
- request has been already sent. <para> The additional information could
+ request has been already sent.
+ </para>
+ <para> The additional information could
be found <ulink
url="http://jboss.com/index.html?module=bb&op=viewtopic&t=105766"
- >here</ulink>. </para>
+ >here</ulink>.
+ </para>
+ <para>
<emphasis>
<property>"RequestDelay"</property>
</emphasis> attribute also defines the client behavior. It sets the
time delay, after which another request could be sent, all other
- requests are taken away from a queue except the last one. </para>
+ requests are taken away from a queue except the last one.
+ </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-04-09 12:04:56 UTC (rev 13457)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-04-09 12:17:30 UTC (rev 13458)
@@ -1304,7 +1304,7 @@
is another way to use its functionality by means of <link linkend="Neko">Neko filter
type</link> . </para>
</note>
- <para> In RichFaces 3.2 filter configuration becomes more flexible. It's possible to
+ <para> From RichFaces 3.2 filter configuration becomes more flexible. It's possible to
configure different filters for different sets of pages for the same application. </para>
<para>The possible filter types are:</para>
<itemizedlist>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13457 - trunk/ui/contextMenu/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 08:04:56 -0400 (Thu, 09 Apr 2009)
New Revision: 13457
Modified:
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
Log:
Failed context menu test fixed
Modified: trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
===================================================================
--- trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2009-04-09 11:41:03 UTC (rev 13456)
+++ trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2009-04-09 12:04:56 UTC (rev 13457)
@@ -68,7 +68,7 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/menu.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/available.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/jquery/jquery.js");
- javaScripts.add("/org/richfaces/renderkit/html/scripts/jquery.utils.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/jquery.utils.js");
}
/**
15 years, 2 months
- 1
- 0