Changeset 7545

Timestamp:

03/24/09 14:07:08 (16 months ago)

Author:

wtoconnor

Message:

For various reasons an article URI can be in the issue article list and not show up in the table of contents. When this happens the user cannot update the Issue because the number of URIs in the csv list in not consistant with the number of URIs in the actual list.

I have found that articles will not show up in the TOC for the following reasons.

1. The Article Type is not in the configuration file.

2. The user input a URI for an article that does not exist.

3. There may be others.

Addresses #1211

Location:

head/ambra/webapp/src/main

Files:

• java/org/topazproject/ambra/admin/action/IssueManagementAction.java (modified) (9 diffs)
• webapp/admin/issueManagement.ftl (modified) (1 diff)

head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/IssueManagementAction.java

@@ -2 +2 @@
  * $$Id$
  *
- * Copyright (c) 2006-2007 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -25 +25 @@
 import org.topazproject.ambra.admin.service.AdminService;
 import org.topazproject.ambra.admin.service.AdminService.JournalInfo;
+import org.topazproject.ambra.model.article.ArticleInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32 +33 @@
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -55 +57 @@
   private Issue         issue;
   private String        articleOrderCSV;
+  private List<URI>     orphans;
   private List<TOCArticleGroup> articleGroups = new ArrayList<TOCArticleGroup>();
 
@@ -142 +145 @@
            */
           if (validateCSV(issue, issueURIs))
-            issue = adminService.updateIssue(issueURI,imageURI,displayName,
-                issueURIs,respectOrder);
+            issue = adminService.updateIssue(issueURI,imageURI,displayName,issueURIs,respectOrder);
 
         } catch (Exception e) {
@@ -160 +162 @@
     articleGroups = browseService.getArticleGrpList(issue);
     articleOrderCSV = browseService.articleGrpListToCSV(articleGroups);
+    orphans = getOrphannedArticles(issue, articleGroups);
+
+    /*
+     * Add the Orphans so that validateCSV doesn't prevent
+     * all updates.
+     */
+    String orphanCSV = convertURIsToCSV(orphans);
+    articleOrderCSV = (orphanCSV.length() > 0) ? articleOrderCSV +","+ orphanCSV : articleOrderCSV;
     journalInfo = adminService.createJournalInfo();
     
     return SUCCESS;
+  }
+
+  /**
+   *
+   * @param uriList
+   * @return
+   */
+  private String convertURIsToCSV(List<URI> uriList) {
+    StringBuilder csv = new StringBuilder();
+
+    for(URI uri : uriList) {
+      if (csv.length() > 0)
+        csv.append(',');
+      csv.append(uri.toString());
+    }
+
+    return csv.toString(); 
+  }
+  
+  /**
+   *
+   * @param issue
+   * @param articleGroups
+   * @return
+   */
+  private List<URI> getOrphannedArticles(Issue issue, List<TOCArticleGroup> articleGroups) {
+    List<URI> articleList = issue.getArticleList();
+    List<URI> orphans = new ArrayList<URI>();
+
+    for(URI articleURI : articleList) {
+      Boolean found = false;
+      for (TOCArticleGroup ag : articleGroups) {
+        List<ArticleInfo> infoList = ag.getArticles();
+        for(ArticleInfo info : infoList ) {
+          if (info.getId().equals(articleURI)) {
+            found = true;
+            break;
+          }
+        }
+      }
+      if (!found)
+        orphans.add(articleURI);
+    }
+
+    return orphans;
   }
 
@@ -191 +246 @@
     }
     return true;
+  }
+
+  /**
+   *
+   * @return
+   */
+  public List<URI> getOrphans() {
+    return this.orphans; 
   }
 
@@ -254 +317 @@
       this.imageURI = null;
       if (log.isDebugEnabled())
-        log.debug("setImage URI conversion failed. ");
+        log.debug("setImage URI conversion failed."  +
+            "imageURI set to null to indicate this: " + uri.trim(), e);
     }
   }
@@ -267 +331 @@
       this.volumeURI = null;
       if (log.isDebugEnabled())
-        log.debug("setVolume URI conversion failed. ");
+        log.debug("setVolume URI conversion failed." +
+            "volumeURI set to null to indicate this: " + uri.trim(), e);
     }
   }

head/ambra/webapp/src/main/webapp/admin/issueManagement.ftl

@@ -145 +145 @@
          </tr>
          </#list>
-      </table>
-      </#list>
+       </table>
+       </#list>
+         <b>Ophanned Articles</b>
+         <table border="1" cellpadding="10" cellspacing="0">
+           <tr>
+             <td colspan="2">
+               <ul>
+               <li><kbd>Articles with types no longer in the configuration file.</kbd></li>
+               <li><kbd>Incorrect URIs not associated with an article.</kbd></li>
+               </ul>
+             </td>
+           </tr>
+           <tr>
+             <th>Delete</th>
+             <th>Article URI</th>
+           </tr>
+           <#list orphans as orphan>
+           <tr>
+             <td align="center">
+                <@s.checkbox name="articlesToRemove" fieldValue="${orphan}"/>
+             </td>
+             <td>
+               ${orphan}
+             </td>
+            </tr>
+           </#list>
+         </table>
       <@s.submit value="Remove Selected Articles"/>
       </@s.form>