Changeset 4307

Timestamp:

01/21/14 10:23:06 (11 years ago)

Author:

twagoo

Message:

LoadableDetachableModel? for complete CMDI view so that the HTML no longer gets cached

Location:

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages

Files:

• CmdiXsltModel.java (added)
• ShowResultPage.java (modified) (6 diffs)

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -7 +7 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.DaoLocator;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -19 +17 @@
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.xml.transform.stream.StreamSource;
-import net.sf.saxon.s9api.Processor;
-import net.sf.saxon.s9api.Serializer;
-import net.sf.saxon.s9api.XdmNode;
-import net.sf.saxon.s9api.XsltCompiler;
-import net.sf.saxon.s9api.XsltExecutable;
-import net.sf.saxon.s9api.XsltTransformer;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.Application;
@@ -76 +67 @@
     public static final String feedbackfromURL = VloConfig.getFeedbackFromUrl();
 
-    private final URL xslFile = getClass().getResource("/eu/clarin/cmdi/vlo/pages/cmdi2xhtml.xsl");
     private final ResourceReference XSL_CSS_REFERENCE = new PackageResourceReference(getClass(), "cmdi.css");
 
@@ -82 +72 @@
     public ShowResultPage(final PageParameters currentParam) {
         super(currentParam);
-        
+
         final StringValue docIdParam = getPageParameters().get(PARAM_DOC_ID);
         if (docIdParam == null) {
@@ -92 +82 @@
                 Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle
         SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
-        
+
         if (solrDocument != null) {
             final SearchPageQuery query = new SearchPageQuery(currentParam);
@@ -565 +555 @@
 
     private void createCompleteCmdiView(final SolrDocument solrDocument) {
-        StringWriter strWriter = new StringWriter();
-
-        final Processor proc = new Processor(false);
-        final XsltCompiler comp = proc.newXsltCompiler();
-
+        final String completeMetadataField = solrDocument.getFirstValue(FacetConstants.FIELD_COMPLETE_METADATA).toString();
         try {
-            final XsltExecutable exp = comp.compile(new StreamSource(xslFile.getFile()));
-            final XdmNode source = proc.newDocumentBuilder().build(
-                    new StreamSource(new InputStreamReader(new URL(solrDocument.getFirstValue(FacetConstants.FIELD_COMPLETE_METADATA).toString()).openStream())));
-            final Serializer out = new Serializer();
-            out.setOutputProperty(Serializer.Property.METHOD, "html");
-            out.setOutputProperty(Serializer.Property.INDENT, "yes");
-            out.setOutputProperty(Serializer.Property.ENCODING, "UTF-8");
-            out.setOutputWriter(strWriter);
-            final XsltTransformer trans = exp.load();
-
-            trans.setInitialContextNode(source);
-            trans.setDestination(out);
-            trans.transform();
-        } catch (Exception e) {
-            LOG.error("Couldn't create CMDI metadata: ", e);
-            strWriter = new StringWriter().append("<b>Could not load complete CMDI metadata</b>");
-        }
-
-        completeCmdiLabel = new Label("completeCmdi", strWriter.toString());
-        completeCmdiLabel.setEscapeModelStrings(false);
+            final CmdiXsltModel cmdiXsltModel = new CmdiXsltModel(new URL(completeMetadataField));
+            completeCmdiLabel = new Label("completeCmdi", cmdiXsltModel);
+            completeCmdiLabel.setEscapeModelStrings(false);
+        } catch (MalformedURLException ex) {
+            LOG.error("Could not create CMDI view, malformed URL: {}", completeMetadataField, ex);
+            completeCmdiLabel = new Label("<b>Could not read metadata</b>");
+        }
     }