Changeset 4311

Timestamp:

01/21/14 10:49:17 (10 years ago)

Author:

twagoo

Message:

Merged changes, amongst which a fix for #481 and most likely the fix for the heap space issues from trunk to 2.18 branch.

Location:

vlo/branches/vlo-2.18

Files:

• . (modified) (1 prop)
• UPGRADE (modified) (1 prop)
• vlo_importer/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java (modified) (3 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/CmdiXsltModel.java (copied) (copied from vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/CmdiXsltModel.java)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (6 diffs)

vlo/branches/vlo-2.18/vlo_importer/src/main/resources/VloConfig.xml

@@ -1 +1 @@
 <VloConfig>
     
-    <pagesInApplicationCache>128</pagesInApplicationCache>
+    <!-- Sets the maximum number of page instances which will be stored in the application scoped second level cache for faster retrieval -->
+    <pagesInApplicationCache>40</pagesInApplicationCache>
     
-    <sessionCacheSize>500</sessionCacheSize>
+    <!-- Sets the maximum size (in KILOBYTES) of the File where page instances per session are stored. -->
+    <sessionCacheSize>10000</sessionCacheSize>
    
     <deleteAllFirst>true</deleteAllFirst>

vlo/branches/vlo-2.18/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java

@@ -21 +21 @@
 import org.apache.wicket.util.string.StringValue;
 import org.apache.wicket.util.lang.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -32 +34 @@
 public class VloWebApplication extends WebApplication {
 
+    private final static Logger logger = LoggerFactory.getLogger(VloWebApplication.class);
+    
     /**
      * Customised client request cycle<br><br>
@@ -113 +117 @@
         
         // configure cache by applying the vlo configuration settings to it
-        this.getStoreSettings().setInmemoryCacheSize(VloConfig.getPagesInApplicationCache());
-        this.getStoreSettings().setMaxSizePerSession(Bytes.kilobytes((long)VloConfig.getSessionCacheSize()));
+        final int pagesInApplicationCache = VloConfig.getPagesInApplicationCache();
+        logger.info("Setting Wicket in-memory cache size to {}", pagesInApplicationCache);
+        this.getStoreSettings().setInmemoryCacheSize(pagesInApplicationCache);
+        
+        final Bytes sessionCacheSize = Bytes.kilobytes((long)VloConfig.getSessionCacheSize());
+        logger.info("Setting Wicket max size per session to {}", sessionCacheSize);
+        this.getStoreSettings().setMaxSizePerSession(sessionCacheSize);
 
         // creata an object referring to the search results

vlo/branches/vlo-2.18/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

@@ -66 +66 @@
         };
         add(facetList);
-        PageParameters facetParameters = new PageParameters ();
+        PageParameters facetParameters = query.getPageParameters();
         facetParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
         facetParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");

vlo/branches/vlo-2.18/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;
@@ -61 +52 @@
 import org.apache.wicket.util.encoding.UrlDecoder;
 import org.apache.wicket.util.encoding.UrlEncoder;
+import org.apache.wicket.util.string.StringValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75 +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");
 
@@ -81 +72 @@
     public ShowResultPage(final PageParameters currentParam) {
         super(currentParam);
+
+        final StringValue docIdParam = getPageParameters().get(PARAM_DOC_ID);
+        if (docIdParam == null) {
+            throw new RuntimeException("No document id was specified. Cannot construct result page.");
+        }
         //Document ID is assumed to have been encoded (typcially in DocumentLinkPanel) decode here
         final String docId = UrlDecoder.QUERY_INSTANCE.decode(
-                getPageParameters().get(PARAM_DOC_ID).toString(),
+                docIdParam.toString(),
                 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);
@@ -558 +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>");
+        }
     }