summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsiddharth <rsiddharth@ninthfloor.org>2012-11-28 18:09:03 +0530
committerrsiddharth <rsiddharth@ninthfloor.org>2012-11-28 18:09:03 +0530
commit1d92dc8eb4180f04abc8513a8f3d7d95fed57fa2 (patch)
treef39b69923a3f1c688224ba79f1ed26722447720b
parent7d0d748b58711a28f1af0fabe8d399ebc067b898 (diff)
bug-fixes; now the final HTML adornings are done in Header,
LastUpdate & CloseHtmlTags parsers added: parsers/CloseHtmlTags.java (closes the HTML tags) modified: index/IndexCreator.java (bug fix) parsers/Header.java (couple of lines moved to CloseHtmlTag parser) parsers/MetaParser.java (copyright text added) parsers/ParserList.java (new parser + some parser sequence re-arrangements)
-rw-r--r--index/IndexCreator.java2
-rw-r--r--parsers/CloseHtmlTags.java46
-rw-r--r--parsers/Header.java7
-rw-r--r--parsers/MetaParser.java23
-rw-r--r--parsers/ParserList.java5
5 files changed, 72 insertions, 11 deletions
diff --git a/index/IndexCreator.java b/index/IndexCreator.java
index e06db24..13b71b0 100644
--- a/index/IndexCreator.java
+++ b/index/IndexCreator.java
@@ -48,7 +48,7 @@ public class IndexCreator {
String fileName = htmlFile.create().getName();
if(shouldAdd(fileName)) {
System.out.println("New Entry: "+fileName);
- indexContent.append("[[./");
+ indexContent.append(" [[./");
indexContent.append(fileName);
indexContent.append("|");
indexContent.append(PresentFile.name);
diff --git a/parsers/CloseHtmlTags.java b/parsers/CloseHtmlTags.java
new file mode 100644
index 0000000..ddeaf10
--- /dev/null
+++ b/parsers/CloseHtmlTags.java
@@ -0,0 +1,46 @@
+/*+
+ * Copyright 2012 rsiddharth
+ * Email: <rsiddharth@ninthfloor.org>
+ *
+ * This file is part of Scruf.
+ *
+ * Scruf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package scruf.parsers;
+
+/**
+ * this class, inserts the main content of the html into the <article>
+ * block.
+ */
+
+public class CloseHtmlTags implements Parser {
+ private StringBuilder sbuilder;
+ /**
+ * the fileContent has its <head> and <article> fields filled.
+ */
+ public String parse(String fileContent) {
+ sbuilder = new StringBuilder();
+ sbuilder.append(fileContent);
+ // add "powered by scruf" at bottom of page.
+ sbuilder.append("\n<div class=\"scruf\">\n");
+ sbuilder.append("<a href=\"http://nongnu.org/scruf/\">powered by scruf</a>");
+ sbuilder.append("\n</div>\n");
+ // Close body tag
+ sbuilder.append("\n</body>\n");
+ sbuilder.append("</html>\n");
+ return sbuilder.toString();
+ }
+}
diff --git a/parsers/Header.java b/parsers/Header.java
index 8bde4c8..88316d5 100644
--- a/parsers/Header.java
+++ b/parsers/Header.java
@@ -48,13 +48,6 @@ public class Header implements Parser {
// insert File Content.
sbuilder.append(fileContent);
sbuilder.append("</article>\n");
- // add "powered by scruf" at bottom of page.
- sbuilder.append("\n<div class=\"scruf\">\n");
- sbuilder.append("<a href=\"http://nongnu.org/scruf/\">powered by scruf</a>");
- sbuilder.append("\n</div>\n");
- // Close body tag
- sbuilder.append("\n</body>\n");
- sbuilder.append("</html>\n");
return sbuilder.toString();
}
diff --git a/parsers/MetaParser.java b/parsers/MetaParser.java
index 3519cf3..4ac9394 100644
--- a/parsers/MetaParser.java
+++ b/parsers/MetaParser.java
@@ -1,3 +1,24 @@
+/*+
+ * Copyright 2012 rsiddharth
+ * Email: <rsiddharth@ninthfloor.org>
+ *
+ * This file is part of Scruf.
+ *
+ * Scruf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
package scruf.parsers;
import java.util.regex.*;
@@ -36,4 +57,4 @@ public class MetaParser implements Parser {
}
return fileContent;
}
-} \ No newline at end of file
+}
diff --git a/parsers/ParserList.java b/parsers/ParserList.java
index a40dcb2..8691cdd 100644
--- a/parsers/ParserList.java
+++ b/parsers/ParserList.java
@@ -34,14 +34,15 @@ public class ParserList {
parsers.add(new DocumentDate());
parsers.add(new WordDecoration());
parsers.add(new Headings());
- parsers.add(new Links());
+ parsers.add(new Links());
parsers.add(new Images());
parsers.add(new Footer());
parsers.add(new Paragraphs());
- parsers.add(new LastUpdate());
parsers.add(new Source());
parsers.add(new BackButton());
parsers.add(new Header());
+ parsers.add(new LastUpdate());
+ parsers.add(new CloseHtmlTags());
}
public List<Parser> list() {
return new ArrayList<Parser>(parsers);