/src/edu/ucsb/nceas/metacat/DBTransform.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5752

Added by ben leinfelder over 13 years ago

use detected XML encoding when reading/writing files
use UTF-8 as default when performing queries in the DB (assume DB is using UTF-8)
remove as many PrintWriters (uses system default character encoding only) as possible and construct OutputStreamWriters where explicit encoding can be given.
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=2495

     package edu.ucsb.nceas.metacat;
     import java.io.*;
     import java.sql.*;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.OutputStreamWriter;
     import java.io.StringReader;
     import java.io.StringWriter;
     import java.io.Writer;
     import java.sql.SQLException;
     import java.util.Enumeration;
     import java.util.Hashtable;
     import java.util.Iterator;
-...
        */
       public void transformXMLDocument(String doc, String sourceType,
                                        String targetType, String qformat,
                                        PrintWriter pw, Hashtable<String, String[]> param,
                                        Writer w, Hashtable<String, String[]> param,
                                        String sessionid)
+     {
         // Look up the stylesheet for this type combination
         String xslSystemId = getStyleSystemId(qformat, sourceType, targetType);
         if (xslSystemId != null)
+        {
           try
           {// Create a stylesheet from the system id that was found
             doc = removeDOCTYPE(doc);
             StringReader xml = new StringReader(doc);
             StreamResult result = new StreamResult(pw);
             doTransform(xml, result, xslSystemId, param, qformat, sessionid);
     	  String xslSystemId = getStyleSystemId(qformat, sourceType, targetType);
     	  try {
     		  // Look up the stylesheet for this type combination
     		  if (xslSystemId != null) {
     			// Create a stylesheet from the system id that was found
     			doc = removeDOCTYPE(doc);
     			StringReader xml = new StringReader(doc);
     			StreamResult result = new StreamResult(w);
     			doTransform(xml, result, xslSystemId, param, qformat, sessionid);
+    		  }
     		  else {
     			  // No stylesheet registered form this document type, so just return the
     			  // XML stream we were passed
     			  w.write(doc);
+    		  }
+          }
           catch (Exception e)
+          {
             pw.println(xslSystemId + ": Error transforming document in " +
                        "DBTransform.transformXMLDocument: " +
                        e.getMessage());
         	  try {
     			w.write(xslSystemId + ": Error transforming document in " +
     			           "DBTransform.transformXMLDocument: " +
     			           e.getMessage());
     		} catch (IOException e1) {
     			logMetacat.error(e1.getMessage(), e1);
+    		}
+          }
+        }
         else
+        {
           // No stylesheet registered form this document type, so just return the
           // XML stream we were passed
           pw.print(doc);
+        }
+      }
       /**
-...
+        }
+      }
       /**
        * Method to do transform for a string reader
        * @param doc the document to be transformed
        * @param sourcetype the document type of the source
        * @param targettype the target document type
        * @param qformat the name of the style set to use
        * @param pw the PrintWriter to which output is printed
        * @param params some parameters for eml2 transformation
        */
        public void transformXMLDocument(StringReader docContent, String sourceType,
                                        String targetType, String qformat,
                                        PrintWriter pw, Hashtable<String, String[]> param,
                                        String sessionid)
+       {
          // Look up the stylesheet for this type combination
         String xslSystemId = getStyleSystemId(qformat, sourceType, targetType);
         if (xslSystemId != null)
+        {
           try
           {// Create a stylesheet from the system id that was found
             StreamResult result = new StreamResult(pw);
             doTransform(docContent, result, xslSystemId, param, qformat, sessionid);
+          }
           catch (Exception e)
+          {
             pw.println(xslSystemId + ": Error transforming document in " +
                        "DBTransform.transformXMLDocument: " +
                        e.getMessage());
+          }
+        }
         else
+        {
           // No stylesheet registered form this document type, so just return the
           // XML stream we were passed
           pw.print(docContent);
+        }
+       }
       /**
        * Reads skin's config file if it exists, and populates Transformer paramaters
        * with its contents.
-...
               // Create a test document
               StringBuffer testdoc = new StringBuffer();
               testdoc.append("<?xml version=\"1.0\"?>");
               String encoding = "UTF-8";
               testdoc.append("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>");
               testdoc.append("<eml-dataset><metafile_id>NCEAS-0001</metafile_id>");
               testdoc.append("<dataset_id>DS001</dataset_id>");
               testdoc.append("<title>My test doc</title></eml-dataset>");
               // Transform the document to the new doctype
               Writer w = new OutputStreamWriter(System.out, encoding);
               DBTransform dbt = new DBTransform();
               dbt.transformXMLDocument(testdoc.toString(),
                                        "-//NCEAS//eml-dataset//EN",
                                        "-//W3C//HTML//EN",
                                        "knb",
                                        new PrintWriter(System.out), null, null);
                                        w, null, null);
             } catch (Exception e) {
               System.err.println("EXCEPTION HANDLING REQUIRED");

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5752

Added by ben leinfelder over 13 years ago