Changeset 17091

Timestamp:

10/10/08 14:14:27 (3 months ago)

Author:

jakub

Message:

List tagging refactoring.

Files:

• trunk/intermine/web/main/src/org/intermine/dwr/AjaxServices.java (modified) (4 diffs)
• trunk/intermine/web/main/src/org/intermine/web/struts/InlineTagEditorChange.java (deleted)

trunk/intermine/web/main/src/org/intermine/dwr/AjaxServices.java

@@ -27 +27 @@
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.TreeSet;
-
-import javax.servlet.ServletContext;
@@ -1236 +1237 @@
-    }
-
-Id
+Name, String tagged, String type
-        try {
-            HttpServletRequest request = getRequest();
@@ -1242 +1243 @@
-            Profile profile = getProfile(request);  
-
-if (!StringUtils.isEmpty(tagId)) {
-    Tag tag = pm.getTagById(Integer.parseInt(tagId));
-// only let users delete their own tags
-       if (tag.getUserProfile().getUsername().equals(profile.getUsername())) {
-           pm.deleteTag(tag
-           HttpSession session = request.getSession
-           ServletContext servletContext = session.getServletContext(
-           Boolean isSuperUser = (Boolean) session.getAttribute(Constants.IS_SUPERUSER);
-           if (isSuperUser != null && isSuperUser.booleanValue()) {
-               SearchRepository tr =
-                   SearchRepository.getGlobalSearchRepository(servletContext
-               tr.webSearchableUnTagged(tag);
-           }
-    }
-}
-return true;
+List<Tag> tags = pm.getTags(tagName, tagged, type, profile.getUsername());
+if (tags.size() == 1 && tags.get(0) != null) {
+Tag tag = tags.get(0);
+        pm.deleteTag(tag);
+        HttpSession session = request.getSession(
+        ServletContext servletContext = session.getServletContext
+        Boolean isSuperUser = (Boolean) session.getAttribute(Constants.IS_SUPERUSER
+        if (isSuperUser != null && isSuperUser.booleanValue()) {
+            SearchRepository tr =
+                SearchRepository.getGlobalSearchRepository(servletContext);
+            tr.webSearchableUnTagged(tag
+        }
+        return true;
+} else {
+   return false;
+}          
-        } catch (Throwable e) {
-            LOG.error("Deleting tag failed", e);
@@ -1294 +1295 @@
-        return ret;
-    }
+    
+    public static Set<String> getObjectTags(String type, String tagged) {
+        return new TreeSet<String>(getDatabaseTags(null, tagged, type));
+    }
-
-    private static List<String> getPrefixes(String s) {