get source document refactored

wyona · Mar 30, 2013 · 82c48ee · 82c48ee
1 parent 548af2e
commit 82c48ee
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java b/src/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
@@ -51,7 +51,6 @@ public class PDFResource extends Resource implements ViewableV2 {
      *
      */
     public PDFResource() {
-
     }
 
     /**
@@ -62,7 +61,7 @@ public ViewDescriptor[] getViewDescriptors() {
     }
 
     /**
-     *
+     * @see org.wyona.yanel.core.api.attributes.ViewableV2#getView(String)
      */
     public View getView(String viewId) throws Exception {
         if (!exists()) {
@@ -75,8 +74,9 @@ public View getView(String viewId) throws Exception {
         defaultView.setResponse(false); // This resource writes directly into the response output stream (because of memory it's better to stream large documents)
 
         try {
-            String yanelPath = getDataPath();
             Repository repo = getRealm().getRepository();
+/*
+            String yanelPath = getDataPath();
             InputStream docSource = null;
             if (yanelPath.startsWith("yanelrepo:") || yanelPath.startsWith("yanelresource:")) {
                 SourceResolver resolver = new SourceResolver(this);
@@ -85,6 +85,7 @@ public View getView(String viewId) throws Exception {
             } else {
                 docSource = repo.getNode(yanelPath).getInputStream();
             }
+*/
 
             // Step 1: Construct a FopFactory
             // (reuse if you plan to render multiple documents!)
@@ -109,7 +110,8 @@ public View getView(String viewId) throws Exception {
 
             org.xml.sax.XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
             xmlReader.setEntityResolver(new org.apache.xml.resolver.tools.CatalogResolver());
-            Source src = new SAXSource(xmlReader, new org.xml.sax.InputSource(docSource));
+            Source src = new SAXSource(xmlReader, new org.xml.sax.InputSource(getSourceDocument()));
+            //Source src = new SAXSource(xmlReader, new org.xml.sax.InputSource(docSource));
 
             Result res = new SAXResult(fop.getDefaultHandler());
 
@@ -184,4 +186,21 @@ private String getXSLTPath(String path) throws Exception {
     public String getMimeType(String viewId) {
         return "application/pdf";
     }
+
+    /**
+     * Get source document
+     */
+    private InputStream getSourceDocument() throws Exception {
+            String yanelPath = getDataPath();
+            Repository repo = getRealm().getRepository();
+            InputStream docSource = null;
+            if (yanelPath.startsWith("yanelrepo:") || yanelPath.startsWith("yanelresource:")) {
+                SourceResolver resolver = new SourceResolver(this);
+                Source source = resolver.resolve(yanelPath, null);
+                docSource = ((StreamSource) source).getInputStream();
+            } else {
+                docSource = repo.getNode(yanelPath).getInputStream();
+            }
+        return docSource;
+    }
 }