Changeset 7439

Timestamp:

03/16/09 14:09:45 (17 months ago)

Author:

wtoconnor

Message:

The CSV string created by articleGrpListToCSV was not inserting commas between article types. Now it will.

Addresses #1147

Files:

• head/ambra/webapp/src/main/java/org/topazproject/ambra/article/service/BrowseService.java (modified) (1 diff)

head/ambra/webapp/src/main/java/org/topazproject/ambra/article/service/BrowseService.java

@@ -767 +767 @@
       browseCache.remove(ISSUE_KEY + issueDoi);
     }
-
-
-  }
-
-  /**
-   *
+  }
+
+  /**
+   * Given a list of Article Groups with correctly ordered articles
+   * create a CSV string of article URIs. The URIs will be in the
+   * order that they show up on the TOC.
+   *
+   * @param  articleGroups the list of TOCArticleGroup to process.
+   * @return a string of a comma separated list of article URIs
    */
   public String articleGrpListToCSV( List<TOCArticleGroup> articleGroups) {
     String articleList = "";
-    for (TOCArticleGroup ag : articleGroups) {
-      Iterator i = ag.articles.listIterator();
-
-      while(i.hasNext()) {
-        ArticleInfo ai = (ArticleInfo)i.next();
-
+    Iterator i = articleGroups.listIterator();
+
+    // Group Loop
+    while(i.hasNext()) {
+      TOCArticleGroup ag = (TOCArticleGroup)i.next();
+      Iterator y = ag.articles.listIterator();
+
+      // Article Loop
+      while(y.hasNext()) {
+        ArticleInfo ai = (ArticleInfo)y.next();
         articleList = articleList + ai.id.toString();
-        if (i.hasNext())
+
+        if (y.hasNext())
           articleList = articleList + ",";
       }
+      if (i.hasNext())
+        articleList = articleList + ",";
     }
     return articleList;