(Preliminary) handling of weblog entry selection and summary.

1 files changed, 4 insertions, 22 deletions

diff --git a/org/madore/damlengine/WeblogPopulate.java b/org/madore/damlengine/WeblogPopulate.java
index 18e46c3..24c61dc 100644
--- a/org/madore/damlengine/WeblogPopulate.java
+++ b/org/madore/damlengine/WeblogPopulate.java
@@ -1,21 +1,16 @@
 package org.madore.damlengine;
 
-import java.util.Properties;
 import java.util.regex.Pattern;
 import java.security.MessageDigest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.xpath.*;
 import org.w3c.dom.*;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSSerializer;
 // import org.xml.sax.EntityResolver;
-import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
-import org.apache.xerces.dom.DOMImplementationSourceImpl;
-import org.postgresql.Driver;
 
 public final class WeblogPopulate {
 
@@ -33,33 +28,20 @@ public final class WeblogPopulate {
     public static void main(String[] args)
 	throws Exception {
 
-	final Resolver resolver = new Resolver();
-        final DocumentBuilderFactory dbf = new DocumentBuilderFactoryImpl();
-        dbf.setNamespaceAware(true);
-        dbf.setValidating(false);
-	final DocumentBuilder db = dbf.newDocumentBuilder();
-	db.setEntityResolver(resolver);
+	final DocumentBuilder db = DamlEngine.GetDocumentBuilder.db;
 
 	if ( args.length == 0 ) {
 	    System.err.println("expecting filename as argument");
 	}
 
-        final DOMImplementationSource domisrc
-	    = new DOMImplementationSourceImpl();
 	final DOMImplementationLS domi
-	    = (DOMImplementationLS)(domisrc.getDOMImplementation("LS"));
+	    = (DOMImplementationLS)(db.getDOMImplementation());
 	LSSerializer ser = domi.createLSSerializer();
 	ser.getDomConfig().setParameter("xml-declaration", false);
 
 	MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
 
-	final String dbUrl = "jdbc:postgresql://localhost/weblog";
-	final Properties dbProps = new Properties();
-	dbProps.setProperty("user", "david");
-	dbProps.setProperty("password", "IHATETHISWHYCANTIUSEUNIXDOMAINSOCKETS");
-	dbProps.setProperty("ssl", "true");
-	dbProps.setProperty("sslfactory", "org.postgresql.ssl.NonValidatingFactory");
-	final Connection conn = (new Driver()).connect(dbUrl, dbProps);
+	final Connection conn = WeblogDatabaseConnection.getConnection();
 
 	final PreparedStatement checkSt
 	    = conn.prepareStatement("SELECT sha1 FROM entries WHERE id=?");
@@ -103,7 +85,7 @@ public final class WeblogPopulate {
 		    continue;
 		Node titleNode = (Node)(texpr.evaluate(ent, XPathConstants.NODE));
 		String titleTxt = (titleNode != null) ? titleNode.getTextContent() : null;
-		String titleXml = ser.writeToString(titleNode);
+		String titleXml = (titleNode != null) ? ser.writeToString(titleNode) : null;
 		conn.setAutoCommit(false);
 		if ( exists ) {
 		    System.err.println("Updating entry "+id);