[Jboss-svn-commits] JBL Code SVN: r1158 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki: . plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-09-20 14:14:46 -0400 (Tue, 20 Sep 2005)
New Revision: 1158

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
Log:
fixed errors caused by getAllPageNames


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-20 17:32:30 UTC (rev 1157)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-20 18:14:46 UTC (rev 1158)
@@ -88,7 +88,7 @@
 		boolean status = false;
 
 		if (pageExists(page.getName())) { // page exists on
-														// harddisk - add new
+			// harddisk - add new
 			// version
 			Properties pageProps = getPageProps(page.getName());
 
@@ -346,9 +346,8 @@
 					System.err.println(ioe);
 				}
 
-				page = new WikiPage(pageName, author, pageContent
-						.toString(), i, i, new Date(pageFile.lastModified()),
-						this, this);
+				page = new WikiPage(pageName, author, pageContent.toString(),
+						i, i, new Date(pageFile.lastModified()), this, this);
 
 				page.setLength(pageFile.length());
 			}
@@ -406,8 +405,7 @@
 
 			getContentAtVersion(page, loadContent, version);
 
-			page.setLastAuthor(getAuthorAtVersion(page.getName(),
-					version));
+			page.setLastAuthor(getAuthorAtVersion(page.getName(), version));
 
 			page.setVersion(version);
 
@@ -571,20 +569,36 @@
 	public Set<String> getAllPageNames() {
 		Set<String> attSet = new HashSet<String>();
 
-		File attDir = new File(pathToMedia + "/");
+		getPageNamesFor("", attSet);
 
+		return attSet;
+	}
+
+	private void getPageNamesFor(String directory, Set<String> attSet) {
+		File attDir = new File(pathToMedia + "/" + directory);
+
 		File[] pageFiles = attDir.listFiles();
 
 		for (int i = 0; i < pageFiles.length; i++) {
 			if ((pageFiles[i].isFile())
 					&& (pageFiles[i].getName().endsWith(".txt"))) {
-				String[] tokens = pageFiles[i].getName().split("/");
-				attSet.add(tokens[tokens.length - 1].substring(0,
-						tokens[tokens.length - 1].length() - 4));
+				//String[] tokens = pageFiles[i].getName().split("/");
+				attSet.add((directory+"/"+pageFiles[i].getName().substring(0, pageFiles[i].getName().length() - ".txt".length())).substring(1));
 			}
 		}
 
-		return attSet;
+		for (int i = 0; i < pageFiles.length; i++) {
+			if ((pageFiles[i].isDirectory())
+					&& (!pageFiles[i].getName().endsWith("-att"))) {
+				
+				// do not take dirs from OLD
+				if (!pageFiles[i].getAbsolutePath().equals(pathToMedia + "/OLD")) {
+					// get names for subpages
+					getPageNamesFor(directory + "/" + pageFiles[i].getName(),
+							attSet);
+				}
+			}
+		}
 	}
 
 	public WikiAttachment getAttachement(String pageName, String attachementName) {
@@ -598,7 +612,7 @@
 		String[] tokens = attachementName.split("\\.");
 
 		Properties props = getAttProps(pageName, attachementName, false);
-		
+
 		if (props == null) {
 			return null;
 		}
@@ -628,7 +642,7 @@
 
 		if (props == null)
 			return -1;
-		
+
 		// looking for the newest version
 		int version = 1;
 

Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-09-20 17:32:30 UTC (rev 1157)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-09-20 18:14:46 UTC (rev 1158)
@@ -35,6 +35,7 @@
 		
 		for (String name : pages) {
 			WikiPage temp = wikiEngine.getByName(name, null);
+
 			then.setTime(temp.getEditDate());
 			
 			then.add(Calendar.DAY_OF_MONTH, numOfDays);