Skip to content

Commit

Permalink
Cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@rymai
rymai committed Dec 11, 2009
1 parent 675082c commit 13fc906
Show file tree
Hide file tree
Showing 10 changed files with 120 additions and 80 deletions.
28 changes: 24 additions & 4 deletions icms-ejb/src/java/icms_ejb/GestionnairePagesBean.java
View file
Expand Up @@ -44,6 +44,11 @@ public List<Page> allArticles() {
return em.createNamedQuery("Page.findAllArticles").getResultList();
}

/**
* Find a page (root, section or article) by its id
* @param id
* @return
*/
public Page find(int id) {
if (id != 0) {
return em.find(Page.class, id);
Expand All @@ -52,6 +57,11 @@ public Page find(int id) {
}
}

/**
* Find a page (root, section or article) by its permalink
* @param perme
* @return Page instance or null
*/
public Page findByPermalink(String perme) {
Query queryPagesByPermalink = em.createNamedQuery("Page.findByPermalink");
queryPagesByPermalink.setParameter("perme", perme);
Expand All @@ -63,16 +73,26 @@ public Page findByPermalink(String perme) {
}
}

public List<Page> children(int parent) {
/**
* Find all pages that are children of the page with id parent_id
* @param parent id of the parent page
* @return List<Page>
*/
public List<Page> children(int parent_id) {
Query queryAllChildren = em.createNamedQuery("Page.findAllChildren");
queryAllChildren.setParameter("parent_id", find(parent));
queryAllChildren.setParameter("parent_id", find(parent_id));
List<Page> articles = queryAllChildren.getResultList();
return articles;
}

public Page parent(int page) {
/**
* Find the parent of the page with id child_id
* @param page
* @return Page instance or null
*/
public Page parent(int child_id) {
Query queryFindParent = em.createNamedQuery("Page.findParent");
queryFindParent.setParameter("id", find(page));
queryFindParent.setParameter("id", find(child_id));
List<Page> pageParente = queryFindParent.getResultList();
if (pageParente.size() == 1) {
return pageParente.get(0);
Expand Down
75 changes: 50 additions & 25 deletions icms-ejb/src/java/icms_ejb/GestionnaireUsersBean.java
View file
Expand Up @@ -14,26 +14,43 @@ public void creerAdmin() {
em.persist(new User("admin", "admin", "99"));
}

public void create(String login, String password, String level) {
User u = new User(login, password, level);
em.persist(u);
}

public void update(int id, String login, String password, String level) {
User u = find(id);
u.update(login, password, level);
em.merge(u);
}

public void destroy(int id) {
User u = find(id);
em.remove(em.merge(u));
}

/**
* Find all users
* @return
*/
public List<User> all() {
return em.createNamedQuery("Users.findAll").getResultList();
}

/**
* Find all users with admin level (99)
* @return
*/
public List<User> findAdmins() {
return em.createNamedQuery("Users.findAdmins").getResultList();
}

public User findUserByLoginAndPassword(String login, String password) {
Query queryUserByLoginAndPassword = em.createNamedQuery("Users.findByLoginAndPassword");
queryUserByLoginAndPassword.setParameter("login", login);
queryUserByLoginAndPassword.setParameter("password", password);

try {
return (User) queryUserByLoginAndPassword.getSingleResult();
} catch (Exception e) {
return null;
}
}

/**
* Find a user by his id
* @param id
* @return
*/
public User find(int id) {
Query queryUserById = em.createNamedQuery("Users.findById");
queryUserById.setParameter("id", id);
Expand All @@ -45,22 +62,30 @@ public User find(int id) {
}
}

public void create(String login, String password, String level) {
User u = new User(login, password, level);
em.persist(u);
}

public void update(int id, String login, String password, String level) {
User u = find(id);
u.update(login, password, level);
em.merge(u);
}
/**
* Find user by his login and password
* @param login
* @param password
* @return User instance or null if not found
*/
public User findUserByLoginAndPassword(String login, String password) {
Query queryUserByLoginAndPassword = em.createNamedQuery("Users.findByLoginAndPassword");
queryUserByLoginAndPassword.setParameter("login", login);
queryUserByLoginAndPassword.setParameter("password", password);

public void destroy(int id) {
User u = find(id);
em.remove(em.merge(u));
try {
return (User) queryUserByLoginAndPassword.getSingleResult();
} catch (Exception e) {
return null;
}
}

/**
* Find admin user by his login and password
* @param login
* @param password
* @return User instance or null if not found
*/
public User findAdminByLoginAndPassword(String login, String password) {
Query queryUserByLoginAndPassword = em.createNamedQuery("Users.findByLoginAndPasswordAndLvl");
queryUserByLoginAndPassword.setParameter("login", login);
Expand Down
14 changes: 9 additions & 5 deletions icms-ejb/src/java/icms_ejb/GestionnaireUsersLocal.java
View file
Expand Up @@ -8,19 +8,23 @@ public interface GestionnaireUsersLocal {

public void creerAdmin();

// CRUD
public void create(String login, String password, String level);

public void update(int id, String login, String password, String level);

public void destroy(int id);

public List<User> all();


// Find one
public User find(int id);

public List<User> findAdmins();

public User findUserByLoginAndPassword(String login, String password);

public User findAdminByLoginAndPassword(String login, String password);

// Find many
public List<User> all();

public List<User> findAdmins();

}
6 changes: 5 additions & 1 deletion icms-ejb/src/java/icms_ejb/Page.java
View file
Expand Up @@ -52,7 +52,7 @@ public class Page implements Serializable {
@ManyToOne
private Page myParent;

// Ne pas supprimer ^^
// Ne pas supprimer, sinon erreur Toplink
public Page() {
}

Expand Down Expand Up @@ -192,6 +192,10 @@ public boolean hasParent() {
return myParent != null;
}

/**
* Not fully-implemented yet
* @return always true for now
*/
public boolean hasChildren() {
// return !new GestionnairePagesBean().children(id).isEmpty();
return true;
Expand Down
1 change: 1 addition & 0 deletions icms-ejb/src/java/icms_ejb/User.java
View file
Expand Up @@ -27,6 +27,7 @@ public class User implements Serializable {
private String password;
private String lvl;

// Ne pas supprimer, sinon erreur Toplink
public User() {
}

Expand Down
7 changes: 3 additions & 4 deletions icms-war/src/java/icms_helper/FlickrHelper.java
View file
Expand Up @@ -27,7 +27,6 @@ public class FlickrHelper {
public FlickrHelper(ArrayList<String> search_terms) {
try {
this.searchTerms = search_terms;
// this.searchTerms.add(0, "");
this.flickr = new Flickr(FLICKR_KEY, FLICKR_SECRET, new REST());
searchFlickr();
} catch (ParserConfigurationException ex) {
Expand All @@ -36,9 +35,9 @@ public FlickrHelper(ArrayList<String> search_terms) {
}

public void searchFlickr() {
PhotoList photoList = getPhotoList(2);
PhotoList photoList = getPhotoList(1);
while (photoList.isEmpty() && !searchTerms.isEmpty()) {
photoList = getPhotoList(3);
photoList = getPhotoList(2);
}

int i = 0;
Expand Down Expand Up @@ -90,8 +89,8 @@ private PhotoList getPhotoList(int terms_count) {
for (int j = 0; j < terms_count && j < searchTerms.size(); j++) {
tmp += searchTerms.get(j) + ",";
tmp_arr[j] = searchTerms.get(j);
searchTerms.remove(j);
}
searchTerms.remove(0);
sp.setTags(tmp_arr);
sp.setText(tmp);
System.out.println("Searching on : " + tmp);
Expand Down
30 changes: 15 additions & 15 deletions icms-war/src/java/icms_helper/TranslateHelper.java
View file
Expand Up @@ -14,6 +14,21 @@ public class TranslateHelper {
SoapStub.Translate translate_config;
String appID, langFrom, langTo, lastTranslation;

public TranslateHelper() {
init();
}

public TranslateHelper(String to) {
init();
setLangTo(to);
}

public TranslateHelper(String from, String to) {
init();
setLangFrom(from);
setLangTo(to);
}

private void init() {
translate_config = new SoapStub.Translate();
appID = "BD061A8446F9FA67F9CD39B278237C98599FAFEA";
Expand All @@ -36,21 +51,6 @@ public void setLangTo(String langTo) {
public String getLastTranslation() {
return lastTranslation;
}

public TranslateHelper() {
init();
}

public TranslateHelper(String to) {
init();
setLangTo(to);
}

public TranslateHelper(String from, String to) {
init();
setLangFrom(from);
setLangTo(to);
}

public void translate(String text) {
try {
Expand Down
15 changes: 0 additions & 15 deletions icms-war/web/js/behaviours.js
View file
Expand Up @@ -56,20 +56,5 @@ function connectItems(service){
connectId: [dojo.byId("thumb_"+node.id)],
label: dojo.byId("description_"+node.id).innerHTML
});

// dojo.connect(dojo.byId("thumb_"+node.id), "onclick", function(e){
// e.preventDefault();
// dojo.query(".masterpiece").map(function(node){
// if(!dojo.hasClass(node, "hidden")) dojo.addClass(node, "hidden");
// });
//
// dojo.query("."+service+"_thumb").map(function(node){
// if(dojo.hasClass(node, "hidden")) dojo.removeClass(node, "hidden");
// });
//
// dojo.removeClass("masterpiece_"+node.id, "hidden");
// dojo.addClass("thumb_"+node.id, "hidden");
// console.info(dojo.hasClass("masterpiece_"+node.id, "hidden"));
// });
});
}
1 change: 1 addition & 0 deletions icms-war/web/liste_articles.jsp
View file
@@ -1,5 +1,6 @@
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<div class="posts">
<h3>Les articles :</h3>
<c:forEach var="a" items="${requestScope['listePages']}">
<div class="post">
<h2 class="title"><a href="/icms-war/article/${a.permalink}">${a.title}</a></h2>
Expand Down
23 changes: 12 additions & 11 deletions icms-war/web/section.jsp
View file
@@ -1,6 +1,12 @@
<%@page language="java" import="icms_ejb.*" %>
<%@page language="java" import="icms_helper.*" %>
<%
Page a = (Page) request.getAttribute("article");
HtmlHelper html = new HtmlHelper();
%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
"http://www.w3.org/TR/html4/loose.dtd">
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
Expand All @@ -11,22 +17,17 @@
</head>
<body>
<jsp:include page="header.jsp" />

<h2>
<%-- <a href="/icms-war/article/<c:out value="${requestScope['article'].myParent.permalink}" escapeXml="true"/>" class="category"><c:out value="${requestScope['article'].myParent.title}" escapeXml="true"/></a>
&rsaquo;--%>
<a href="/icms-war/article/<c:out value="${requestScope['article'].myParent.permalink}" escapeXml="true"/>" class="category"><c:out value="${requestScope['article'].myParent.title}" escapeXml="true"/></a>
&rsaquo;
<a href="/icms-war/article/<c:out value="${requestScope['article'].permalink}" escapeXml="true"/>" class="section"><c:out value="${requestScope['article'].title}" escapeXml="true"/></a>
</h2>
<p id="breadcrumb">
<%= html.generateBreadCrumb(a)%>
</p>
<div id="description">
<jsp:include page="article_template.jsp" />
<jsp:include page="article_template.jsp" />
</div>

<jsp:include page="liste_sections.jsp" />

<jsp:include page="liste_articles.jsp" />

<jsp:include page="footer.jsp" />
</body>
</html>

0 comments on commit 13fc906

Please sign in to comment.