Changeset 4978

Timestamp:

04/15/14 09:14:17 (10 years ago)

Author:

Twan Goosen

Message:

lazy retrieval of resolved resource href's/file names in expanded details
(todo: add to record page; implement retrieval)

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• config/VloSpringConfig.java (modified) (3 diffs)
• service/UriResolver.java (added)
• service/impl/HandleResolver.java (added)
• service/impl/ResourceStringConverterImpl.java (modified) (4 diffs)
• wicket/panels/record/ResourceLinksPanel.java (modified) (2 diffs)
• wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (5 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -29 +29 @@
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
+import eu.clarin.cmdi.vlo.service.UriResolver;
 import eu.clarin.cmdi.vlo.service.XmlTransformationService;
+import eu.clarin.cmdi.vlo.service.impl.HandleResolver;
 import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
 import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
@@ -127 +129 @@
     }
 
-    @Bean
+    @Bean(name = "resourceStringConverter")
     public ResourceStringConverter resourceStringConverter() {
         return new ResourceStringConverterImpl();
+    }
+
+    @Bean(name = "resolvingResourceStringConverter")
+    public ResourceStringConverter resolvingResourceStringConverter() {
+        return new ResourceStringConverterImpl(handleResolver());
+    }
+
+    @Bean
+    public UriResolver handleResolver() {
+        return new HandleResolver();
     }
 
@@ -159 +171 @@
                 vloConfig().getTechnicalFields()));
     }
-    
-    @Bean(name="searchResultPropertiesFilter")
+
+    @Bean(name = "searchResultPropertiesFilter")
     public FieldFilter searchResultPropertiesFilter() {
         return new InclusiveFieldFilter(vloConfig().getSearchResultFields());

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImpl.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.CommonUtils;
 import eu.clarin.cmdi.vlo.FacetConstants;
+import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PREFIX;
 import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
 import eu.clarin.cmdi.vlo.pojo.ResourceType;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
+import eu.clarin.cmdi.vlo.service.UriResolver;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -34 +36 @@
 
     private final static String SPLIT_PATTERN = Pattern.quote(FacetConstants.FIELD_RESOURCE_SPLIT_CHAR);
+    private final UriResolver resolver;
+
+    /**
+     * creates a converter that does not attempt to resolve
+     */
+    public ResourceStringConverterImpl() {
+        this(null);
+    }
+
+    /**
+     *
+     * @param resolver resolver to apply to resource URI to get final href
+     */
+    public ResourceStringConverterImpl(UriResolver resolver) {
+        this.resolver = resolver;
+    }
 
     @Override
@@ -40 +58 @@
         final String[] tokens = resourceString.split(SPLIT_PATTERN, 2);
         final String mimeType = tokens[0];
-        final String href = tokens[1];
+        final String href;
+        if (resolver == null) {
+            href = tokens[1];
+        } else {
+            href = resolver.resolve(tokens[1]);
+        }
 
         final String fileName = getFileName(href);
@@ -55 +78 @@
             final String path = uri.getPath();
             // in case of path information or handle, return original href
-            if (path == null || path.isEmpty() || (scheme != null && scheme.equals("hdl"))) {
+            if (path == null || path.isEmpty() || (scheme != null && scheme.equals(HANDLE_PREFIX))) {
                 return href;
             } else {

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java

@@ -42 +42 @@
 public class ResourceLinksPanel extends Panel {
 
-    @SpringBean
+    @SpringBean(name = "resourceStringConverter")
     private ResourceStringConverter resourceStringConverter;
 
@@ -74 +74 @@
             final IModel<String> linkModel = new HandleLinkModel(new PropertyModel(resourceInfoModel, "href"));
             final ExternalLink link = new ExternalLink("showResource", linkModel);
-            
+
             // set the file name as the link's text content
             link.add(new Label("filename", new PropertyModel(resourceInfoModel, "fileName")));

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

@@ -32 +32 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -43 +45 @@
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.apache.wicket.util.time.Duration;
 
 /**
@@ -50 +53 @@
 public class SearchResultItemExpandedPanel extends GenericPanel<SolrDocument> {
 
-    @SpringBean(name = "searchResultPropertiesFilter") 
+    @SpringBean(name = "searchResultPropertiesFilter")
     private FieldFilter propertiesFilter;
-    @SpringBean
+    @SpringBean(name = "resourceStringConverter")
     ResourceStringConverter resourceStringConverter;
+    @SpringBean(name = "resolvingResourceStringConverter")
+    ResourceStringConverter resolvingResourceStringConverter;
 
     public SearchResultItemExpandedPanel(String id, IModel<SolrDocument> documentModel, IModel<SearchContext> selectionModel) {
@@ -89 +94 @@
 
             @Override
-            protected void populateItem(ListItem<String> item) {
+            protected void populateItem(final ListItem<String> item) {
                 // get resource string converted into a ResourceInfo model
                 final ResourceInfoModel resourceInfoModel = new ResourceInfoModel(resourceStringConverter, item.getModel());
@@ -96 +101 @@
                 final ExternalLink resourceLink = new ExternalLink("resourceLink", new PropertyModel(resourceInfoModel, "href"));
                 resourceLink.add(new Label("resourceName", new PropertyModel(resourceInfoModel, "fileName")));
+                resourceLink.setOutputMarkupId(true);
+
+                // once loaded, make Ajax request to resolve handles and update
+                // resource link
+                resourceLink.add(new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+
+                    @Override
+                    protected void onTimer(AjaxRequestTarget target) {
+                        this.stop(target);
+                        resourceInfoModel.setObject(
+                                resolvingResourceStringConverter.getResourceInfo(item.getModelObject()));
+                        target.add(resourceLink);
+                    }
+
+                });
 
                 // add a tooltip showing resource type and mime type